# HG changeset patch # User jlahoda # Date 1488231644 -3600 # Node ID 57843026e60b721b87594dad3c67f9c4787ddb36 # Parent 205b7632914c747d4f7b11996429a02c6229a5fc# Parent f7b6892fd754a67c3c43593a7534a24151947f62 Merging cleanups to the donation_review branch. diff -r 205b7632914c -r 57843026e60b build.xml --- a/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/ant/build.xml --- a/cmdline/ant/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/ant/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/ant/nbproject/build-impl.xml --- a/cmdline/ant/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/ant/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + org.netbeans.modules.java.j2seproject diff -r 205b7632914c -r 57843026e60b cmdline/ap/build.xml --- a/cmdline/ap/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/ap/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/ap/nbproject/build-impl.xml --- a/cmdline/ap/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/ap/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/ap/nbproject/genfiles.properties --- a/cmdline/ap/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/ap/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=abf35b3d build.xml.script.CRC32=434ef419 build.xml.stylesheet.CRC32=a56c6a5b@2.70 diff -r 205b7632914c -r 57843026e60b cmdline/ap/nbproject/project.properties --- a/cmdline/ap/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/ap/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.7 javac.compilerargs=-Xlint -Xlint:-serial cp.extra=build/jackpot-ap-lib.jar:${tools.jar} diff -r 205b7632914c -r 57843026e60b cmdline/ap/nbproject/project.xml --- a/cmdline/ap/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/ap/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b cmdline/ap/nbproject/suite.properties --- a/cmdline/ap/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/ap/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b cmdline/ap/src/META-INF/services/javax.annotation.processing.Processor --- a/cmdline/ap/src/META-INF/services/javax.annotation.processing.Processor Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/ap/src/META-INF/services/javax.annotation.processing.Processor Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,43 @@ + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + # + # Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + # + # Oracle and Java are registered trademarks of Oracle and/or its affiliates. + # Other names may be trademarks of their respective owners. + # + # The contents of this file are subject to the terms of either the GNU + # General Public License Version 2 only ("GPL") or the Common + # Development and Distribution License("CDDL") (collectively, the + # "License"). You may not use this file except in compliance with the + # License. You can obtain a copy of the License at + # http://www.netbeans.org/cddl-gplv2.html + # or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + # specific language governing permissions and limitations under the + # License. When distributing the software, include this License Header + # Notice in each file and include the License file at + # nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + # particular file as subject to the "Classpath" exception as provided + # by Oracle in the GPL Version 2 section of the License file that + # accompanied this code. If applicable, add the following below the + # License Header, with the fields enclosed by brackets [] replaced by + # your own identifying information: + # "Portions Copyrighted [year] [name of copyright owner]" + # + # Contributor(s): + # + # The Original Software is NetBeans. The Initial Developer of the Original + # Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + # Microsystems, Inc. All Rights Reserved. + # + # If you wish your version of this file to be governed by only the CDDL + # or only the GPL Version 2, indicate your decision by adding + # "[Contributor] elects to include this software in this distribution + # under the [CDDL or GPL Version 2] license." If you do not indicate a + # single choice of license, a recipient has the option to distribute + # your version of this file under either the CDDL, the GPL Version 2 or + # to extend the choice of license to its licensees as provided above. + # However, if you add GPL Version 2 code and therefore, elected the GPL + # Version 2 license, then the option applies only if the new code is + # made subject to such option by the copyright holder. + org.netbeans.modules.jackpot30.ap.ProcessorImpl diff -r 205b7632914c -r 57843026e60b cmdline/ap/src/org/netbeans/modules/jackpot30/ap/Bundle.properties --- a/cmdline/ap/src/org/netbeans/modules/jackpot30/ap/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/ap/src/org/netbeans/modules/jackpot30/ap/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Jackpot 3.0 Annotation Processing diff -r 205b7632914c -r 57843026e60b cmdline/build.sh --- a/cmdline/build.sh Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/build.sh Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ #!/bin/bash -x + +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + ant "$@" clean && ant "$@" build && ant "$@" test && (cd compiler; ant "$@" create-standalone-compiler && build/test/scripted/run ) && (cd tool; ant "$@" create-standalone-tool && build/test/scripted/run ) && (cd lib; ant "$@" create-cmdline-lib ) && (cd ap; ant "$@" build-ap-jar ) || exit 1 mvn $MAVEN_EXTRA_ARGS install:install-file -Dfile=tool/build/jackpot/jackpot.jar -DgroupId=org.netbeans.modules.jackpot30 -DartifactId=tool -Dversion=8.1-SNAPSHOT -Dpackaging=jar -DgeneratePom=true (cd maven; mvn $MAVEN_EXTRA_ARGS install -DskipTests; mvn $MAVEN_EXTRA_ARGS -Dmaven.executable=`which mvn` test) diff -r 205b7632914c -r 57843026e60b cmdline/build.xml --- a/cmdline/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/compiler/build.xml --- a/cmdline/compiler/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/compiler/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/compiler/nbproject/build-impl.xml --- a/cmdline/compiler/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/compiler/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/compiler/nbproject/genfiles.properties --- a/cmdline/compiler/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/compiler/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=bbccd04c build.xml.script.CRC32=3d84c86a build.xml.stylesheet.CRC32=79c3b980@1.33 diff -r 205b7632914c -r 57843026e60b cmdline/compiler/nbproject/project.properties --- a/cmdline/compiler/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/compiler/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. ant.jar=${ant.core.lib} is.autoload=true javac.source=1.6 diff -r 205b7632914c -r 57843026e60b cmdline/compiler/nbproject/project.xml --- a/cmdline/compiler/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/compiler/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b cmdline/compiler/nbproject/suite.properties --- a/cmdline/compiler/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/compiler/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b cmdline/compiler/scripts/jackpotc --- a/cmdline/compiler/scripts/jackpotc Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/compiler/scripts/jackpotc Mon Feb 27 22:40:44 2017 +0100 @@ -1,2 +1,45 @@ #!/bin/bash + +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + java -Xbootclasspath/p:`dirname $0`/jackpotc.jar com.sun.tools.javac.Main -Xjcov "$@" diff -r 205b7632914c -r 57843026e60b cmdline/compiler/src/com/sun/tools/javac/api/JavacTaskImplHack.java --- a/cmdline/compiler/src/com/sun/tools/javac/api/JavacTaskImplHack.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package com.sun.tools.javac.api; - -import com.sun.tools.javac.util.Context; - -/** - * - * @author lahvac - */ -public class JavacTaskImplHack extends JavacTaskImpl { - - public JavacTaskImplHack(Context ctx) { - super(ctx); - } - -} diff -r 205b7632914c -r 57843026e60b cmdline/compiler/src/com/sun/tools/javac/resources/compiler.java --- a/cmdline/compiler/src/com/sun/tools/javac/resources/compiler.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package com.sun.tools.javac.resources; - -import org.netbeans.modules.jackpot30.compiler.CompilerResourcesImpl; - -/** - * - * @author lahvac - */ -public class compiler extends CompilerResourcesImpl {} diff -r 205b7632914c -r 57843026e60b cmdline/compiler/src/com/sun/tools/javac/resources/javac.java --- a/cmdline/compiler/src/com/sun/tools/javac/resources/javac.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package com.sun.tools.javac.resources; - -import org.netbeans.modules.jackpot30.compiler.CompilerResourcesImpl; - -/** - * - * @author lahvac - */ -public class javac extends CompilerResourcesImpl {} diff -r 205b7632914c -r 57843026e60b cmdline/compiler/src/org/netbeans/api/java/source/CompilationInfoHack.java --- a/cmdline/compiler/src/org/netbeans/api/java/source/CompilationInfoHack.java Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/compiler/src/org/netbeans/api/java/source/CompilationInfoHack.java Mon Feb 27 22:40:44 2017 +0100 @@ -43,7 +43,7 @@ import com.sun.source.util.JavacTask; import com.sun.source.util.TreePath; import com.sun.source.util.Trees; -import com.sun.tools.javac.api.JavacTaskImplHack; +import com.sun.tools.javac.api.JavacTaskImpl; import com.sun.tools.javac.api.JavacTrees; import com.sun.tools.javac.code.Source; import com.sun.tools.javac.model.JavacElements; @@ -118,7 +118,7 @@ try { context.put(JavacTask.class, (JavacTask) null); - javacTask.set(this.impl, new JavacTaskImplHack(context)); + javacTask.set(this.impl, new JavacTaskImpl(context) {}); } finally { context.put(JavacTask.class, (JavacTask) null); context.put(JavacTask.class, prevTask); diff -r 205b7632914c -r 57843026e60b cmdline/lib/build.xml --- a/cmdline/lib/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/lib/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/lib/nbproject/build-impl.xml --- a/cmdline/lib/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/lib/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/lib/nbproject/genfiles.properties --- a/cmdline/lib/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/lib/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=bbccd04c build.xml.script.CRC32=3d84c86a build.xml.stylesheet.CRC32=79c3b980@1.33 diff -r 205b7632914c -r 57843026e60b cmdline/lib/nbproject/project.properties --- a/cmdline/lib/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/lib/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. is.autoload=true javac.source=1.7 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b cmdline/lib/nbproject/project.xml --- a/cmdline/lib/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/lib/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b cmdline/lib/nbproject/suite.properties --- a/cmdline/lib/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/lib/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b cmdline/maven/pom.xml --- a/cmdline/maven/pom.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/pom.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ + 4.0.0 diff -r 205b7632914c -r 57843026e60b cmdline/maven/src/test/resources/unit/test-project-1/pom.xml --- a/cmdline/maven/src/test/resources/unit/test-project-1/pom.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ - - 4.0.0 - - org.netbeans.modules.jackpot30.test - test-project-1 - 1.0-SNAPSHOT - jar - - test-project-1 - http://maven.apache.org - - - UTF-8 - - - - - junit - junit - 3.8.1 - test - - - - - - org.netbeans.modules.jackpot30 - jackpot30-maven-plugin - 1.0-SNAPSHOT - - - - - diff -r 205b7632914c -r 57843026e60b cmdline/maven/src/test/resources/unit/test-project-1/src/main/java/org/netbeans/modules/jackpot30/test/testproject1/App.java --- a/cmdline/maven/src/test/resources/unit/test-project-1/src/main/java/org/netbeans/modules/jackpot30/test/testproject1/App.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -package org.netbeans.modules.jackpot30.test.testproject1; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff -r 205b7632914c -r 57843026e60b cmdline/maven/src/test/resources/unit/test-project-1/src/test/java/org/netbeans/modules/jackpot30/test/testproject1/AppTest.java --- a/cmdline/maven/src/test/resources/unit/test-project-1/src/test/java/org/netbeans/modules/jackpot30/test/testproject1/AppTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -package org.netbeans.modules.jackpot30.test.testproject1; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/sl-15/jackpot-settings.xml --- a/cmdline/maven/tests/sl-15/jackpot-settings.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/sl-15/jackpot-settings.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/sl-15/pom.xml --- a/cmdline/maven/tests/sl-15/pom.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/sl-15/pom.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ + 4.0.0 diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/sl-15/src/main/java/test/App.java --- a/cmdline/maven/tests/sl-15/src/main/java/test/App.java Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/sl-15/src/main/java/test/App.java Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ package test; import java.util.*; diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/sl-17/golden --- a/cmdline/maven/tests/sl-17/golden Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/sl-17/golden Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,3 @@ -${basedir}/src/main/java/test/App.java:8: warning: [Can_Use_Diamond] redundant type arguments in new expression (use diamond operator instead). +${basedir}/src/main/java/test/App.java:51: warning: [Can_Use_Diamond] redundant type arguments in new expression (use diamond operator instead). List l = new ArrayList(); ^ diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/sl-17/jackpot-settings.xml --- a/cmdline/maven/tests/sl-17/jackpot-settings.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/sl-17/jackpot-settings.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/sl-17/pom.xml --- a/cmdline/maven/tests/sl-17/pom.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/sl-17/pom.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ + 4.0.0 diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/sl-17/src/main/java/test/App.java --- a/cmdline/maven/tests/sl-17/src/main/java/test/App.java Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/sl-17/src/main/java/test/App.java Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ package test; import java.util.*; diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/test-custom/golden --- a/cmdline/maven/tests/test-custom/golden Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/test-custom/golden Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,3 @@ -${basedir}/src/main/java/test/App.java:5: warning: [test] test +${basedir}/src/main/java/test/App.java:48: warning: [test] test System.err.println(args[0].length() == 0); ^ diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/test-custom/pom.xml --- a/cmdline/maven/tests/test-custom/pom.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/test-custom/pom.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ + 4.0.0 diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/test-custom/src/main/java/test/App.java --- a/cmdline/maven/tests/test-custom/src/main/java/test/App.java Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/test-custom/src/main/java/test/App.java Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ package test; public class App { diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/test-custom/src/main/resources/META-INF/upgrade/test.hint --- a/cmdline/maven/tests/test-custom/src/main/resources/META-INF/upgrade/test.hint Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/test-custom/src/main/resources/META-INF/upgrade/test.hint Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,45 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ + $str.length() == 0 :: $str instanceof java.lang.String;; diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/test1/golden --- a/cmdline/maven/tests/test1/golden Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/test1/golden Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,3 @@ -${basedir}/src/main/java/test/App.java:7: warning: [Synchronization_on_non_final_field] Synchronization on non-final field +${basedir}/src/main/java/test/App.java:50: warning: [Synchronization_on_non_final_field] Synchronization on non-final field synchronized (LOCK) { ^ diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/test1/jackpot-settings.xml --- a/cmdline/maven/tests/test1/jackpot-settings.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/test1/jackpot-settings.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/test1/pom.xml --- a/cmdline/maven/tests/test1/pom.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/test1/pom.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ + 4.0.0 diff -r 205b7632914c -r 57843026e60b cmdline/maven/tests/test1/src/main/java/test/App.java --- a/cmdline/maven/tests/test1/src/main/java/test/App.java Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/maven/tests/test1/src/main/java/test/App.java Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ package test; public class App { diff -r 205b7632914c -r 57843026e60b cmdline/nbproject/build-impl.xml --- a/cmdline/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/nbproject/genfiles.properties --- a/cmdline/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=56bbc279 build.xml.script.CRC32=ed17867f build.xml.stylesheet.CRC32=eaf9f76a@1.44 diff -r 205b7632914c -r 57843026e60b cmdline/nbproject/platform.properties --- a/cmdline/nbproject/platform.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/nbproject/platform.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. cluster.path=\ ${nbplatform.active.dir}/apisupport:\ ${nbplatform.active.dir}/cnd:\ diff -r 205b7632914c -r 57843026e60b cmdline/nbproject/platform.xml --- a/cmdline/nbproject/platform.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/nbproject/platform.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/nbproject/project.properties --- a/cmdline/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. modules=\ ${project.org.netbeans.modules.jackpot30.cmdline.lib}:\ ${project.org.netbeans.modules.jackpot30.compiler}:\ diff -r 205b7632914c -r 57843026e60b cmdline/nbproject/project.xml --- a/cmdline/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project.suite diff -r 205b7632914c -r 57843026e60b cmdline/tool/build.xml --- a/cmdline/tool/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/tool/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/tool/nbproject/build-impl.xml --- a/cmdline/tool/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/tool/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b cmdline/tool/nbproject/genfiles.properties --- a/cmdline/tool/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/tool/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=e6358ca2 build.xml.script.CRC32=4c2aebb3 build.xml.stylesheet.CRC32=a56c6a5b@1.44 diff -r 205b7632914c -r 57843026e60b cmdline/tool/nbproject/project.properties --- a/cmdline/tool/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/tool/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.7 javac.compilerargs=-Xlint -Xlint:-serial cp.extra=../../lib/jopt-simple/jopt-simple-3.2.jar diff -r 205b7632914c -r 57843026e60b cmdline/tool/nbproject/project.xml --- a/cmdline/tool/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/tool/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b cmdline/tool/nbproject/suite.properties --- a/cmdline/tool/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/tool/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b cmdline/tool/scripts/jackpot --- a/cmdline/tool/scripts/jackpot Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/tool/scripts/jackpot Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ #!/bin/bash + +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + JACKPOT_JAR=`readlink -f "$0"` JACKPOT_JAR=`dirname "$JACKPOT_JAR"`/jackpot.jar java -classpath `dirname "$JACKPOT_JAR"`/jackpot.jar org.netbeans.modules.jackpot30.cmdline.Main "$@" diff -r 205b7632914c -r 57843026e60b cmdline/tool/scripts/jackpot.bat --- a/cmdline/tool/scripts/jackpot.bat Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/tool/scripts/jackpot.bat Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +@echo off +REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +REM +REM Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +REM +REM Oracle and Java are registered trademarks of Oracle and/or its affiliates. +REM Other names may be trademarks of their respective owners. +REM +REM The contents of this file are subject to the terms of either the GNU +REM General Public License Version 2 only ("GPL") or the Common +REM Development and Distribution License("CDDL") (collectively, the +REM "License"). You may not use this file except in compliance with the +REM License. You can obtain a copy of the License at +REM http://www.netbeans.org/cddl-gplv2.html +REM or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +REM specific language governing permissions and limitations under the +REM License. When distributing the software, include this License Header +REM Notice in each file and include the License file at +REM nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +REM particular file as subject to the "Classpath" exception as provided +REM by Oracle in the GPL Version 2 section of the License file that +REM accompanied this code. If applicable, add the following below the +REM License Header, with the fields enclosed by brackets [] replaced by +REM your own identifying information: +REM "Portions Copyrighted [year] [name of copyright owner]" +REM +REM Contributor(s): +REM +REM The Original Software is NetBeans. The Initial Developer of the Original +REM Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +REM Microsystems, Inc. All Rights Reserved. +REM +REM If you wish your version of this file to be governed by only the CDDL +REM or only the GPL Version 2, indicate your decision by adding +REM "[Contributor] elects to include this software in this distribution +REM under the [CDDL or GPL Version 2] license." If you do not indicate a +REM single choice of license, a recipient has the option to distribute +REM your version of this file under either the CDDL, the GPL Version 2 or +REM to extend the choice of license to its licensees as provided above. +REM However, if you add GPL Version 2 code and therefore, elected the GPL +REM Version 2 license, then the option applies only if the new code is +REM made subject to such option by the copyright holder. + @echo on set dirname=%0%\.. java -classpath "%dirname:"=%\jackpot.jar" org.netbeans.modules.jackpot30.cmdline.Main %* diff -r 205b7632914c -r 57843026e60b cmdline/tool/src/org/netbeans/modules/jackpot30/cmdline/Bundle.properties --- a/cmdline/tool/src/org/netbeans/modules/jackpot30/cmdline/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/tool/src/org/netbeans/modules/jackpot30/cmdline/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Jackpot 3.0 Command Line Tool diff -r 205b7632914c -r 57843026e60b cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/DoRunTests.classx Binary file cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/DoRunTests.classx has changed diff -r 205b7632914c -r 57843026e60b cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/DoRunTests.javax --- a/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/DoRunTests.javax Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -package org.netbeans.modules.jackpot30.cmdline.testtool; - -import junit.framework.TestSuite; -import org.netbeans.modules.java.hints.declarative.test.api.DeclarativeHintsTestBase; - -/** - * - * @author lahvac - */ -public class DoRunTests extends DeclarativeHintsTestBase { - - public static TestSuite suite() { - return suite(DoRunTests.class); - } - -} diff -r 205b7632914c -r 57843026e60b cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/MainTest.java --- a/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/MainTest.java Mon Dec 19 11:37:36 2016 +0100 +++ b/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/MainTest.java Mon Feb 27 22:40:44 2017 +0100 @@ -42,8 +42,11 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; import java.util.Arrays; @@ -52,6 +55,8 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.tools.SimpleJavaFileObject; +import javax.tools.ToolProvider; import org.junit.runner.Result; import org.netbeans.api.java.source.TestUtilities; import org.netbeans.junit.NbTestCase; @@ -633,6 +638,19 @@ } //verify that the DeclarativeHintsTestBase works: + private static final String CODE_RUN_DECLARATIVE = + "package org.netbeans.modules.jackpot30.cmdline.testtool;\n" + + "\n" + + "import junit.framework.TestSuite;\n" + + "import org.netbeans.modules.java.hints.declarative.test.api.DeclarativeHintsTestBase;\n" + + "\n" + + "public class DoRunTests extends DeclarativeHintsTestBase {\n" + + "\n" + + " public static TestSuite suite() {\n" + + " return suite(DoRunTests.class);\n" + + " }\n" + + "\n" + + "}\n"; public void testRunTest() throws Exception { clearWorkDir(); @@ -664,22 +682,29 @@ "}}\n"; TestUtilities.copyStringToFile(new File(classes, "h.test"), test); - File runner = new File(classes, "org/netbeans/modules/jackpot30/cmdline/testtool/DoRunTests.class"); + List options = Arrays.asList("-d", classes.getAbsolutePath()); + List files = Arrays.asList(new SourceFO("DoRunTests.java", CODE_RUN_DECLARATIVE)); - assertTrue(runner.getParentFile().mkdirs()); - - FileOutputStream os = new FileOutputStream(runner); - InputStream is = MainTest.class.getResourceAsStream("DoRunTests.classx"); - - assertNotNull(is); - - FileUtil.copy(is, os); - os.close (); - is.close(); + assertTrue(ToolProvider.getSystemJavaCompiler().getTask(null, null, null, options, null, files).call()); runAndTest(classes); } + private static final class SourceFO extends SimpleJavaFileObject { + + private final String code; + private SourceFO(String name, String code) throws URISyntaxException { + super(new URI("mem:///" + name), Kind.SOURCE); + this.code = code; + } + + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { + return code; + } + + } + protected void runAndTest(File classes) throws Exception { ClassLoader cl = new URLClassLoader(new URL[] {classes.toURI().toURL()}, MainTest.class.getClassLoader()); Class doRunTests = Class.forName("org.netbeans.modules.jackpot30.cmdline.testtool.DoRunTests", true, cl); diff -r 205b7632914c -r 57843026e60b duplicates/build.sh --- a/duplicates/build.sh Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/build.sh Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ #!/bin/bash + +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + (cd ide; ant "$@" clean && ant "$@" nbms && ant "$@" test) || exit 1 (cd server/indexer; ant "$@" clean && ant "$@" build && cp -r build/cluster build/indexer; cp -r ../../ide/build/cluster/* build/indexer/; cp -r ../../../remoting/ide/build/cluster/* build/indexer/; cd build; zip -r ../../../../remoting/build/duplicates-indexer.zip indexer/) || exit 1 (cd server/web/duplicates.web.api; ant "$@" clean && ant "$@") || exit 1 diff -r 205b7632914c -r 57843026e60b duplicates/ide/build.xml --- a/duplicates/ide/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b duplicates/ide/impl/build.xml --- a/duplicates/ide/impl/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/impl/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b duplicates/ide/impl/nbproject/build-impl.xml --- a/duplicates/ide/impl/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/impl/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b duplicates/ide/impl/nbproject/genfiles.properties --- a/duplicates/ide/impl/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/impl/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=f3f3f30d build.xml.script.CRC32=b45f306d build.xml.stylesheet.CRC32=a56c6a5b@2.49 diff -r 205b7632914c -r 57843026e60b duplicates/ide/impl/nbproject/project.properties --- a/duplicates/ide/impl/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/impl/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,2 +1,43 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b duplicates/ide/impl/nbproject/project.xml --- a/duplicates/ide/impl/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/impl/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b duplicates/ide/impl/nbproject/suite.properties --- a/duplicates/ide/impl/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/impl/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b duplicates/ide/impl/src/org/netbeans/modules/jackpot30/duplicates/impl/Bundle.properties --- a/duplicates/ide/impl/src/org/netbeans/modules/jackpot30/duplicates/impl/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/impl/src/org/netbeans/modules/jackpot30/duplicates/impl/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Jackpot 3.0 Duplicates Impl diff -r 205b7632914c -r 57843026e60b duplicates/ide/impl/src/org/netbeans/modules/jackpot30/impl/duplicates/Bundle.properties --- a/duplicates/ide/impl/src/org/netbeans/modules/jackpot30/impl/duplicates/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/impl/src/org/netbeans/modules/jackpot30/impl/duplicates/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. CTL_GlobalFindDuplicates=Global Find Duplicates DuplicatesListPanel.findMore.text=Look for More DuplicatesListPanel.progressLabel.text= diff -r 205b7632914c -r 57843026e60b duplicates/ide/nbproject/build-impl.xml --- a/duplicates/ide/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b duplicates/ide/nbproject/genfiles.properties --- a/duplicates/ide/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=891734f5 build.xml.script.CRC32=82b74f72 build.xml.stylesheet.CRC32=eaf9f76a@2.49 diff -r 205b7632914c -r 57843026e60b duplicates/ide/nbproject/platform.properties --- a/duplicates/ide/nbproject/platform.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/nbproject/platform.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. cluster.path=\ ${nbplatform.active.dir}/apisupport:\ ${nbplatform.active.dir}/cnd:\ diff -r 205b7632914c -r 57843026e60b duplicates/ide/nbproject/platform.xml --- a/duplicates/ide/nbproject/platform.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/nbproject/platform.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b duplicates/ide/nbproject/project.properties --- a/duplicates/ide/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. modules=\ ${project.org.netbeans.modules.jackpot30.duplicates.impl} project.org.netbeans.modules.jackpot30.duplicates.impl=impl diff -r 205b7632914c -r 57843026e60b duplicates/ide/nbproject/project.xml --- a/duplicates/ide/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/ide/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project.suite diff -r 205b7632914c -r 57843026e60b duplicates/server/indexer/build.xml --- a/duplicates/server/indexer/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/indexer/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b duplicates/server/indexer/impl/build.xml --- a/duplicates/server/indexer/impl/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/indexer/impl/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b duplicates/server/indexer/impl/nbproject/build-impl.xml --- a/duplicates/server/indexer/impl/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/indexer/impl/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b duplicates/server/indexer/impl/nbproject/genfiles.properties --- a/duplicates/server/indexer/impl/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/indexer/impl/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=fc98a110 build.xml.script.CRC32=5603d4c2 build.xml.stylesheet.CRC32=a56c6a5b@2.70 diff -r 205b7632914c -r 57843026e60b duplicates/server/indexer/impl/nbproject/project.properties --- a/duplicates/server/indexer/impl/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/indexer/impl/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,2 +1,43 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b duplicates/server/indexer/impl/nbproject/project.xml --- a/duplicates/server/indexer/impl/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/indexer/impl/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b duplicates/server/indexer/impl/nbproject/suite.properties --- a/duplicates/server/indexer/impl/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/indexer/impl/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b duplicates/server/indexer/nbproject/build-impl.xml --- a/duplicates/server/indexer/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/indexer/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b duplicates/server/indexer/nbproject/genfiles.properties --- a/duplicates/server/indexer/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/indexer/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=8121b4f6 build.xml.script.CRC32=58124a00 build.xml.stylesheet.CRC32=eaf9f76a@2.50 diff -r 205b7632914c -r 57843026e60b duplicates/server/indexer/nbproject/platform.properties --- a/duplicates/server/indexer/nbproject/platform.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/indexer/nbproject/platform.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. cluster.path=\ ${nbplatform.active.dir}/apisupport:\ ${nbplatform.active.dir}/cnd:\ diff -r 205b7632914c -r 57843026e60b duplicates/server/indexer/nbproject/platform.xml --- a/duplicates/server/indexer/nbproject/platform.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/indexer/nbproject/platform.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b duplicates/server/indexer/nbproject/project.properties --- a/duplicates/server/indexer/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/indexer/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. modules=\ ${project.org.netbeans.modules.jackpot30.duplicates.remoting} project.org.netbeans.modules.jackpot30.duplicates.remoting=impl diff -r 205b7632914c -r 57843026e60b duplicates/server/indexer/nbproject/project.xml --- a/duplicates/server/indexer/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/indexer/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project.suite diff -r 205b7632914c -r 57843026e60b duplicates/server/web/duplicates.web.api/build.xml --- a/duplicates/server/web/duplicates.web.api/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/web/duplicates.web.api/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b duplicates/server/web/duplicates.web.api/nbproject/build-impl.xml --- a/duplicates/server/web/duplicates.web.api/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/duplicates/server/web/duplicates.web.api/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + org.netbeans.modules.java.j2seproject diff -r 205b7632914c -r 57843026e60b hudson.indexerinstaller/build.xml --- a/hudson.indexerinstaller/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project org.netbeans.modules.hudson.indexerinstaller. - - diff -r 205b7632914c -r 57843026e60b hudson.indexerinstaller/manifest.mf --- a/hudson.indexerinstaller/manifest.mf Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -Manifest-Version: 1.0 -OpenIDE-Module: org.netbeans.modules.hudson.indexerinstaller -OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/indexerinstaller/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 - diff -r 205b7632914c -r 57843026e60b hudson.indexerinstaller/nbproject/build-impl.xml --- a/hudson.indexerinstaller/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 205b7632914c -r 57843026e60b hudson.indexerinstaller/nbproject/genfiles.properties --- a/hudson.indexerinstaller/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -build.xml.data.CRC32=dd261bbc -build.xml.script.CRC32=9653f76d -build.xml.stylesheet.CRC32=a56c6a5b@2.70 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=dd261bbc -nbproject/build-impl.xml.script.CRC32=4d4ae753 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70 diff -r 205b7632914c -r 57843026e60b hudson.indexerinstaller/nbproject/platform.properties --- a/hudson.indexerinstaller/nbproject/platform.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -cluster.path=\ - ${nbplatform.active.dir}/apisupport:\ - ${nbplatform.active.dir}/harness:\ - ${nbplatform.active.dir}/ide:\ - ${nbplatform.active.dir}/extide:\ - ${nbplatform.active.dir}/java:\ - ${nbplatform.active.dir}/nb:\ - ${nbplatform.active.dir}/platform:\ - ${nbplatform.active.dir}/profiler:\ - ${nbplatform.active.dir}/websvccommon -nbplatform.active=NetBeans_IDE_Dev_(Build_110104-0651fbe9eaa1) diff -r 205b7632914c -r 57843026e60b hudson.indexerinstaller/nbproject/project.properties --- a/hudson.indexerinstaller/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -javac.source=1.6 -javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b hudson.indexerinstaller/nbproject/project.xml --- a/hudson.indexerinstaller/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - org.netbeans.modules.hudson.indexerinstaller - - - - org.netbeans.api.progress - - - - 1 - 1.25 - - - - org.netbeans.api.progress.nb - - - - 1.45 - - - - org.netbeans.modules.hudson - - - - 1.12 - - - - org.openide.awt - - - - 7.35 - - - - org.openide.util - - - - 8.16 - - - - org.openide.windows - - - - 6.43 - - - - - - unit - - org.netbeans.libs.junit4 - - - - org.netbeans.modules.nbjunit - - - - - - - - ext/hudson-cli.jar - release/modules/ext/hudson-cli.jar - - - - diff -r 205b7632914c -r 57843026e60b hudson.indexerinstaller/src/org/netbeans/modules/hudson/indexerinstaller/Bundle.properties --- a/hudson.indexerinstaller/src/org/netbeans/modules/hudson/indexerinstaller/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -OpenIDE-Module-Name=Hudson NetBeans Plugin Installer diff -r 205b7632914c -r 57843026e60b hudson.indexerinstaller/src/org/netbeans/modules/hudson/indexerinstaller/InstallHudsonExtension.java --- a/hudson.indexerinstaller/src/org/netbeans/modules/hudson/indexerinstaller/InstallHudsonExtension.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,119 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2011 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.hudson.indexerinstaller; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.IOException; -import java.net.URL; -import javax.swing.JOptionPane; -import javax.swing.SwingUtilities; -import org.netbeans.api.progress.ProgressUtils; -import org.netbeans.modules.hudson.api.HudsonInstance; -import org.openide.awt.ActionID; -import org.openide.awt.ActionReference; -import org.openide.awt.ActionRegistration; -import org.openide.util.Exceptions; -import org.openide.util.NbBundle.Messages; -import org.openide.windows.WindowManager; -import hudson.cli.CLI; - -@ActionID( - category="Team", - id="org.netbeans.modules.hudson.indexerinstaller.InstallHudsonExtension" -) -@ActionRegistration( - displayName="#CTL_InstallHudsonExtension" -) -@ActionReference(path=HudsonInstance.ACTION_PATH, position=950) -@Messages({"CTL_InstallHudsonExtension=Install Hudson Extension", - "CTL_InstallingPlugin=Installing Plugin", - "CTL_RestartTitle=Plugin Installed", - "CTL_Restart=Restart Hudson?", - "CTL_Failed=Installation Failed"}) -public final class InstallHudsonExtension implements ActionListener { - private final HudsonInstance context; - - public InstallHudsonExtension(HudsonInstance context) { - this.context = context; - } - - public void actionPerformed(ActionEvent ev) { - try { - final Installer installer = new Installer(context.getUrl()); - URL url = CLI.class.getProtectionDomain().getCodeSource().getLocation(); - String name = url.getPath(); - final String plugin = name.substring(name.indexOf("/"), name.indexOf("ext/hudson-cli.jar")) + "plugin/org.netbeans.modules.jackpot30.hudson.hpi"; - ProgressUtils.showProgressDialogAndRun(new Runnable() { - @Override - public void run() { - final int exit = installer.installPlugin(plugin); - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - if (exit == -1) { - int n = JOptionPane.showConfirmDialog(WindowManager.getDefault().getMainWindow(), Bundle.CTL_Restart(), - Bundle.CTL_RestartTitle(), - JOptionPane.YES_NO_OPTION); - if (n==JOptionPane.YES_OPTION) { - installer.restartHudson(); - } - } else { - JOptionPane.showMessageDialog(WindowManager.getDefault().getMainWindow(), Bundle.CTL_Failed()); - - } - } - - }); - - }},Bundle.CTL_InstallingPlugin() - ); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } catch (InterruptedException ex) { - Exceptions.printStackTrace(ex); - } - - } -} diff -r 205b7632914c -r 57843026e60b hudson.indexerinstaller/src/org/netbeans/modules/hudson/indexerinstaller/Installer.java --- a/hudson.indexerinstaller/src/org/netbeans/modules/hudson/indexerinstaller/Installer.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package org.netbeans.modules.hudson.indexerinstaller; - -import hudson.cli.CLI; -import java.io.IOException; -import java.net.URL; - -/** - * - * @author Jan Becicka - */ -public class Installer { - - private CLI cli; - public Installer(String hudson) throws IOException, InterruptedException { - this.cli = new CLI(new URL(hudson)); - } - - public int restartHudson() { - return this.cli.execute("restart"); //NOI18N - } - - public int installPlugin(String plugin) { - return this.cli.execute("install-plugin", plugin); //NOI18N - } - -} diff -r 205b7632914c -r 57843026e60b hudson/download-extra-nbms.xml --- a/hudson/download-extra-nbms.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/hudson/download-extra-nbms.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b hudson/trunk --- a/hudson/trunk Mon Dec 19 11:37:36 2016 +0100 +++ b/hudson/trunk Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ #!/bin/bash -x + +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + prepare_platform() { if [ "$TRUNK_URL" == "" ] ; then TRUNK_URL="http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc"; diff -r 205b7632914c -r 57843026e60b language/build.sh --- a/language/build.sh Mon Dec 19 11:37:36 2016 +0100 +++ b/language/build.sh Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ #!/bin/bash + +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + (cd ide; ant "$@" clean && ant "$@" nbms && ant "$@" test) || exit 1 diff -r 205b7632914c -r 57843026e60b language/ide/bridges/apisupport/build.xml --- a/language/ide/bridges/apisupport/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/bridges/apisupport/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b language/ide/bridges/apisupport/nbproject/build-impl.xml --- a/language/ide/bridges/apisupport/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/bridges/apisupport/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b language/ide/bridges/apisupport/nbproject/genfiles.properties --- a/language/ide/bridges/apisupport/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/bridges/apisupport/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=c45369e1 build.xml.script.CRC32=a2cc69eb build.xml.stylesheet.CRC32=79c3b980@1.40 diff -r 205b7632914c -r 57843026e60b language/ide/bridges/apisupport/nbproject/project.properties --- a/language/ide/bridges/apisupport/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/bridges/apisupport/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. is.eager=true javac.source=1.5 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b language/ide/bridges/apisupport/nbproject/project.xml --- a/language/ide/bridges/apisupport/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/bridges/apisupport/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b language/ide/bridges/apisupport/nbproject/suite.properties --- a/language/ide/bridges/apisupport/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/bridges/apisupport/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/../.. diff -r 205b7632914c -r 57843026e60b language/ide/bridges/apisupport/src/org/netbeans/modules/jackpot30/apisupport/Bundle.properties --- a/language/ide/bridges/apisupport/src/org/netbeans/modules/jackpot30/apisupport/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/bridges/apisupport/src/org/netbeans/modules/jackpot30/apisupport/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Jackpot 3.0 APISupport Bridge diff -r 205b7632914c -r 57843026e60b language/ide/build.xml --- a/language/ide/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b language/ide/indexing/build.xml --- a/language/ide/indexing/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/indexing/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b language/ide/indexing/nbproject/build-impl.xml --- a/language/ide/indexing/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/indexing/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b language/ide/indexing/nbproject/genfiles.properties --- a/language/ide/indexing/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/indexing/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=68c5618a build.xml.script.CRC32=f0946049 build.xml.stylesheet.CRC32=a56c6a5b@2.49 diff -r 205b7632914c -r 57843026e60b language/ide/indexing/nbproject/project.properties --- a/language/ide/indexing/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/indexing/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial spec.version.base=1.0 diff -r 205b7632914c -r 57843026e60b language/ide/indexing/nbproject/project.xml --- a/language/ide/indexing/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/indexing/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b language/ide/indexing/nbproject/suite.properties --- a/language/ide/indexing/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/indexing/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/Bundle.properties --- a/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Jackpot 3.0 Indexing diff -r 205b7632914c -r 57843026e60b language/ide/nbproject/build-impl.xml --- a/language/ide/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b language/ide/nbproject/genfiles.properties --- a/language/ide/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=d27fe1de build.xml.script.CRC32=466d9285 build.xml.stylesheet.CRC32=eaf9f76a@2.49 diff -r 205b7632914c -r 57843026e60b language/ide/nbproject/platform.properties --- a/language/ide/nbproject/platform.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/nbproject/platform.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. cluster.path=\ ${nbplatform.active.dir}/apisupport:\ ${nbplatform.active.dir}/harness:\ diff -r 205b7632914c -r 57843026e60b language/ide/nbproject/platform.xml --- a/language/ide/nbproject/platform.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/nbproject/platform.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b language/ide/nbproject/project.properties --- a/language/ide/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. modules=\ ${project.org.netbeans.modules.jackpot30.indexing}:\ ${project.org.netbeans.modules.jackpot30.ui}:\ diff -r 205b7632914c -r 57843026e60b language/ide/nbproject/project.xml --- a/language/ide/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project.suite diff -r 205b7632914c -r 57843026e60b language/ide/ui/build.xml --- a/language/ide/ui/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/ui/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b language/ide/ui/nbproject/build-impl.xml --- a/language/ide/ui/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/ui/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b language/ide/ui/nbproject/genfiles.properties --- a/language/ide/ui/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/ui/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=8268870d build.xml.script.CRC32=4ac38acd build.xml.stylesheet.CRC32=a56c6a5b@2.49 diff -r 205b7632914c -r 57843026e60b language/ide/ui/nbproject/project.properties --- a/language/ide/ui/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/ui/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial requires.nb.javac=true diff -r 205b7632914c -r 57843026e60b language/ide/ui/nbproject/project.xml --- a/language/ide/ui/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/ui/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b language/ide/ui/nbproject/suite.properties --- a/language/ide/ui/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/ui/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b language/ide/ui/src/org/netbeans/modules/jackpot30/ui/Bundle.properties --- a/language/ide/ui/src/org/netbeans/modules/jackpot30/ui/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/ui/src/org/netbeans/modules/jackpot30/ui/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Jackpot 3.0 Extra UI diff -r 205b7632914c -r 57843026e60b language/ide/ui/src/org/netbeans/modules/jackpot30/ui/layer.xml --- a/language/ide/ui/src/org/netbeans/modules/jackpot30/ui/layer.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/ide/ui/src/org/netbeans/modules/jackpot30/ui/layer.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b language/post-build.sh --- a/language/post-build.sh Mon Dec 19 11:37:36 2016 +0100 +++ b/language/post-build.sh Mon Feb 27 22:40:44 2017 +0100 @@ -1,2 +1,45 @@ #!/bin/bash + +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + (cd server/web/language.web.api; ant "$@" clean && ant "$@") || exit 1 diff -r 205b7632914c -r 57843026e60b language/server/web/language.web.api/build.xml --- a/language/server/web/language.web.api/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/server/web/language.web.api/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b language/server/web/language.web.api/nbproject/build-impl.xml --- a/language/server/web/language.web.api/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/language/server/web/language.web.api/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + org.netbeans.modules.java.j2seproject diff -r 205b7632914c -r 57843026e60b language/server/web/language.web.api/src/org/netbeans/modules/jackpot30/backend/language/api/ui-search.html --- a/language/server/web/language.web.api/src/org/netbeans/modules/jackpot30/backend/language/api/ui-search.html Mon Dec 19 11:37:36 2016 +0100 +++ b/language/server/web/language.web.api/src/org/netbeans/modules/jackpot30/backend/language/api/ui-search.html Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ + diff -r 205b7632914c -r 57843026e60b language/server/web/language.web.api/src/org/netbeans/modules/jackpot30/backend/language/api/ui-snippet.html --- a/language/server/web/language.web.api/src/org/netbeans/modules/jackpot30/backend/language/api/ui-snippet.html Mon Dec 19 11:37:36 2016 +0100 +++ b/language/server/web/language.web.api/src/org/netbeans/modules/jackpot30/backend/language/api/ui-snippet.html Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,47 @@ + + <#if snippets??> <#list snippets as snippet> 
${snippet.prefix}${snippet.occurrence}${snippet.suffix}

diff -r 205b7632914c -r 57843026e60b lib/download.xml --- a/lib/download.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/lib/download.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ + diff -r 205b7632914c -r 57843026e60b lib/nblibraries.properties --- a/lib/nblibraries.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/lib/nblibraries.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. libs.CopyLibs.classpath=\ ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar libs.CopyLibs.displayName=CopyLibs Task diff -r 205b7632914c -r 57843026e60b nbproject/project.xml --- a/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.ant.freeform diff -r 205b7632914c -r 57843026e60b remoting/build.sh --- a/remoting/build.sh Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/build.sh Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ #!/bin/bash + +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + (cd common; ant "$@" clean && ant "$@" build) || exit 1 (cd ide; ant "$@" clean && (cd ../common; ant "$@" -Dbuild.updates.dir=../ide/build/updates nbms) && ant "$@" nbms) || exit 1 rm -rf build diff -r 205b7632914c -r 57843026e60b remoting/common/api/build.xml --- a/remoting/common/api/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/api/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/common/api/nbproject/build-impl.xml --- a/remoting/common/api/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/api/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/common/api/nbproject/genfiles.properties --- a/remoting/common/api/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/api/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=11046abd build.xml.script.CRC32=22857ef0 build.xml.stylesheet.CRC32=a56c6a5b@2.49 diff -r 205b7632914c -r 57843026e60b remoting/common/api/nbproject/project.properties --- a/remoting/common/api/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/api/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. is.autoload=true javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b remoting/common/api/nbproject/project.xml --- a/remoting/common/api/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/api/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/common/api/nbproject/suite.properties --- a/remoting/common/api/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/api/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b remoting/common/api/src/org/netbeans/modules/jackpot30/common/Bundle.properties --- a/remoting/common/api/src/org/netbeans/modules/jackpot30/common/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/api/src/org/netbeans/modules/jackpot30/common/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Jackpot 3.0 Common APIs diff -r 205b7632914c -r 57843026e60b remoting/common/borrowedtests/build.xml --- a/remoting/common/borrowedtests/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/borrowedtests/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/common/borrowedtests/nbproject/build-impl.xml --- a/remoting/common/borrowedtests/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/borrowedtests/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/common/borrowedtests/nbproject/genfiles.properties --- a/remoting/common/borrowedtests/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/borrowedtests/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=a4393221 build.xml.script.CRC32=3cb17d2d build.xml.stylesheet.CRC32=79c3b980@1.28.0.7 diff -r 205b7632914c -r 57843026e60b remoting/common/borrowedtests/nbproject/platform.properties --- a/remoting/common/borrowedtests/nbproject/platform.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/borrowedtests/nbproject/platform.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. cluster.path=\ ${nbplatform.active.dir}/identity:\ ${nbplatform.active.dir}/enterprise:\ diff -r 205b7632914c -r 57843026e60b remoting/common/borrowedtests/nbproject/project.properties --- a/remoting/common/borrowedtests/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/borrowedtests/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. is.autoload=true javac.source=1.5 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b remoting/common/borrowedtests/nbproject/project.xml --- a/remoting/common/borrowedtests/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/borrowedtests/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/common/borrowedtests/nbproject/suite.properties --- a/remoting/common/borrowedtests/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/borrowedtests/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b remoting/common/build.xml --- a/remoting/common/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/common/nbproject/build-impl.xml --- a/remoting/common/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/common/nbproject/genfiles.properties --- a/remoting/common/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=8c462dad build.xml.script.CRC32=263c4f10 build.xml.stylesheet.CRC32=eaf9f76a@2.49 diff -r 205b7632914c -r 57843026e60b remoting/common/nbproject/platform.properties --- a/remoting/common/nbproject/platform.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/nbproject/platform.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. cluster.path=\ ${nbplatform.active.dir}/apisupport:\ ${nbplatform.active.dir}/profiler:\ diff -r 205b7632914c -r 57843026e60b remoting/common/nbproject/platform.xml --- a/remoting/common/nbproject/platform.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/nbproject/platform.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/common/nbproject/project.properties --- a/remoting/common/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. app.title=common modules=\ ${project.org.netbeans.modules.jackpot30.common}:\ diff -r 205b7632914c -r 57843026e60b remoting/common/nbproject/project.xml --- a/remoting/common/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project.suite diff -r 205b7632914c -r 57843026e60b remoting/common/test/build.xml --- a/remoting/common/test/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/test/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/common/test/nbproject/build-impl.xml --- a/remoting/common/test/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/test/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/common/test/nbproject/genfiles.properties --- a/remoting/common/test/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/test/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=4735325c build.xml.script.CRC32=b3a2b248 build.xml.stylesheet.CRC32=a56c6a5b@2.49 diff -r 205b7632914c -r 57843026e60b remoting/common/test/nbproject/project.properties --- a/remoting/common/test/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/test/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. is.autoload=true javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b remoting/common/test/nbproject/project.xml --- a/remoting/common/test/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/test/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/common/test/nbproject/suite.properties --- a/remoting/common/test/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/test/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b remoting/common/test/src/org/netbeans/modules/jackpot30/common/test/Bundle.properties --- a/remoting/common/test/src/org/netbeans/modules/jackpot30/common/test/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/common/test/src/org/netbeans/modules/jackpot30/common/test/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Jackpot 3.0 Common Test APIs diff -r 205b7632914c -r 57843026e60b remoting/ide/api/build.xml --- a/remoting/ide/api/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/api/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/api/nbproject/build-impl.xml --- a/remoting/ide/api/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/api/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/api/nbproject/genfiles.properties --- a/remoting/ide/api/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/api/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=83c779aa build.xml.script.CRC32=4e65cd58 build.xml.stylesheet.CRC32=a56c6a5b@1.47 diff -r 205b7632914c -r 57843026e60b remoting/ide/api/nbproject/project.properties --- a/remoting/ide/api/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/api/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial extra.module.files=modules/ext/util-commons.jar,modules/ext/util-pojson.jar diff -r 205b7632914c -r 57843026e60b remoting/ide/api/nbproject/project.xml --- a/remoting/ide/api/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/api/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/ide/api/nbproject/suite.properties --- a/remoting/ide/api/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/api/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b remoting/ide/api/src/org/netbeans/modules/jackpot30/remotingapi/Bundle.properties --- a/remoting/ide/api/src/org/netbeans/modules/jackpot30/remotingapi/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/api/src/org/netbeans/modules/jackpot30/remotingapi/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Remoting API diff -r 205b7632914c -r 57843026e60b remoting/ide/api/src/org/netbeans/modules/jackpot30/remotingapi/options/Bundle.properties --- a/remoting/ide/api/src/org/netbeans/modules/jackpot30/remotingapi/options/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/api/src/org/netbeans/modules/jackpot30/remotingapi/options/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. AdvancedOption_DisplayName_Index=Jackpot 3.0 Indices AdvancedOption_Keywords_Index=index indices jackpot CustomizeRemoteIndex.indexURLLabel.text=Index URL: diff -r 205b7632914c -r 57843026e60b remoting/ide/browsing/build.xml --- a/remoting/ide/browsing/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/browsing/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/browsing/nbproject/build-impl.xml --- a/remoting/ide/browsing/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/browsing/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/browsing/nbproject/genfiles.properties --- a/remoting/ide/browsing/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/browsing/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=d895a237 build.xml.script.CRC32=461c092a build.xml.stylesheet.CRC32=a56c6a5b@2.61 diff -r 205b7632914c -r 57843026e60b remoting/ide/browsing/nbproject/project.properties --- a/remoting/ide/browsing/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/browsing/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,2 +1,43 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b remoting/ide/browsing/nbproject/project.xml --- a/remoting/ide/browsing/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/browsing/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/ide/browsing/nbproject/suite.properties --- a/remoting/ide/browsing/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/browsing/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b remoting/ide/browsing/src/org/netbeans/modules/jackpot30/ide/browsing/Bundle.properties --- a/remoting/ide/browsing/src/org/netbeans/modules/jackpot30/ide/browsing/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/browsing/src/org/netbeans/modules/jackpot30/ide/browsing/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Jackpot 3.0 Remote Browsing diff -r 205b7632914c -r 57843026e60b remoting/ide/build.xml --- a/remoting/ide/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/cnd.remote.bridge/build.xml --- a/remoting/ide/cnd.remote.bridge/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/cnd.remote.bridge/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/cnd.remote.bridge/nbproject/build-impl.xml --- a/remoting/ide/cnd.remote.bridge/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/cnd.remote.bridge/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/cnd.remote.bridge/nbproject/genfiles.properties --- a/remoting/ide/cnd.remote.bridge/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/cnd.remote.bridge/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=629cf149 build.xml.script.CRC32=28461e36 build.xml.stylesheet.CRC32=a56c6a5b@2.45 diff -r 205b7632914c -r 57843026e60b remoting/ide/cnd.remote.bridge/nbproject/platform.properties --- a/remoting/ide/cnd.remote.bridge/nbproject/platform.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/cnd.remote.bridge/nbproject/platform.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. cluster.path=\ ${nbplatform.active.dir}/apisupport:\ ${nbplatform.active.dir}/cnd:\ diff -r 205b7632914c -r 57843026e60b remoting/ide/cnd.remote.bridge/nbproject/project.properties --- a/remoting/ide/cnd.remote.bridge/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/cnd.remote.bridge/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. is.eager=true javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b remoting/ide/cnd.remote.bridge/nbproject/project.xml --- a/remoting/ide/cnd.remote.bridge/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/cnd.remote.bridge/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/ide/cnd.remote.bridge/src/org/netbeans/modules/jackpot30/cnd/remote/bridge/Bundle.properties --- a/remoting/ide/cnd.remote.bridge/src/org/netbeans/modules/jackpot30/cnd/remote/bridge/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/cnd.remote.bridge/src/org/netbeans/modules/jackpot30/cnd/remote/bridge/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Jackpot 3.0 C/C++ Remote FS Bridge diff -r 205b7632914c -r 57843026e60b remoting/ide/cnd.remote.bridge/src/org/netbeans/modules/jackpot30/cnd/remote/bridge/FileSystemListerImpl.java --- a/remoting/ide/cnd.remote.bridge/src/org/netbeans/modules/jackpot30/cnd/remote/bridge/FileSystemListerImpl.java Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/cnd.remote.bridge/src/org/netbeans/modules/jackpot30/cnd/remote/bridge/FileSystemListerImpl.java Mon Feb 27 22:40:44 2017 +0100 @@ -1,6 +1,45 @@ /* - * To change this template, choose Tools | Templates and open the template in - * the editor. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. */ package org.netbeans.modules.jackpot30.cnd.remote.bridge; diff -r 205b7632914c -r 57843026e60b remoting/ide/downloadable/build.xml --- a/remoting/ide/downloadable/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/downloadable/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/downloadable/nbproject/build-impl.xml --- a/remoting/ide/downloadable/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/downloadable/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/downloadable/nbproject/genfiles.properties --- a/remoting/ide/downloadable/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/downloadable/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=c2cda89c build.xml.script.CRC32=14841d35 build.xml.stylesheet.CRC32=a56c6a5b@2.46 diff -r 205b7632914c -r 57843026e60b remoting/ide/downloadable/nbproject/project.properties --- a/remoting/ide/downloadable/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/downloadable/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial spec.version.base=1.1 diff -r 205b7632914c -r 57843026e60b remoting/ide/downloadable/nbproject/project.xml --- a/remoting/ide/downloadable/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/downloadable/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/ide/downloadable/nbproject/suite.properties --- a/remoting/ide/downloadable/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/downloadable/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b remoting/ide/downloadable/src/org/netbeans/modules/jackpot30/remoting/downloadable/Bundle.properties --- a/remoting/ide/downloadable/src/org/netbeans/modules/jackpot30/remoting/downloadable/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/downloadable/src/org/netbeans/modules/jackpot30/remoting/downloadable/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,2 +1,43 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Display-Category=Java OpenIDE-Module-Name=Remoting - Downloadable Index HIGHLY EXPERIMENTAL diff -r 205b7632914c -r 57843026e60b remoting/ide/downloadable/src/org/netbeans/modules/jackpot30/remoting/downloadable/DownloadedIndexPatcherImpl.java --- a/remoting/ide/downloadable/src/org/netbeans/modules/jackpot30/remoting/downloadable/DownloadedIndexPatcherImpl.java Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/downloadable/src/org/netbeans/modules/jackpot30/remoting/downloadable/DownloadedIndexPatcherImpl.java Mon Feb 27 22:40:44 2017 +0100 @@ -1,6 +1,45 @@ /* - * To change this template, choose Tools | Templates and open the template in - * the editor. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. */ package org.netbeans.modules.jackpot30.remoting.downloadable; diff -r 205b7632914c -r 57843026e60b remoting/ide/jumpto/build.xml --- a/remoting/ide/jumpto/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/jumpto/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/jumpto/nbproject/build-impl.xml --- a/remoting/ide/jumpto/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/jumpto/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/jumpto/nbproject/genfiles.properties --- a/remoting/ide/jumpto/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/jumpto/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=14c2e29c build.xml.script.CRC32=c7b5d9b7 build.xml.stylesheet.CRC32=a56c6a5b@1.45 diff -r 205b7632914c -r 57843026e60b remoting/ide/jumpto/nbproject/project.properties --- a/remoting/ide/jumpto/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/jumpto/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial spec.version.base=1.6 diff -r 205b7632914c -r 57843026e60b remoting/ide/jumpto/nbproject/project.xml --- a/remoting/ide/jumpto/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/jumpto/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/ide/jumpto/nbproject/suite.properties --- a/remoting/ide/jumpto/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/jumpto/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b remoting/ide/jumpto/src/org/netbeans/modules/jackpot30/jumpto/Bundle.properties --- a/remoting/ide/jumpto/src/org/netbeans/modules/jackpot30/jumpto/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/jumpto/src/org/netbeans/modules/jackpot30/jumpto/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=jackpot 3.0 Jumpto Bridge diff -r 205b7632914c -r 57843026e60b remoting/ide/kit/build.xml --- a/remoting/ide/kit/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/kit/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/kit/nbproject/build-impl.xml --- a/remoting/ide/kit/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/kit/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/kit/nbproject/genfiles.properties --- a/remoting/ide/kit/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/kit/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=fb399e54 build.xml.script.CRC32=14f758ae build.xml.stylesheet.CRC32=a56c6a5b@2.49 diff -r 205b7632914c -r 57843026e60b remoting/ide/kit/nbproject/project.properties --- a/remoting/ide/kit/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/kit/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,2 +1,43 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b remoting/ide/kit/nbproject/project.xml --- a/remoting/ide/kit/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/kit/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/ide/kit/nbproject/suite.properties --- a/remoting/ide/kit/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/kit/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b remoting/ide/kit/src/org/netbeans/modules/jackpot30/remoting/kit/Bundle.properties --- a/remoting/ide/kit/src/org/netbeans/modules/jackpot30/remoting/kit/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/kit/src/org/netbeans/modules/jackpot30/remoting/kit/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,2 +1,43 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Display-Category=Java OpenIDE-Module-Name=Jackpot 3.0 Remoting Kit diff -r 205b7632914c -r 57843026e60b remoting/ide/local/build.xml --- a/remoting/ide/local/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/local/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/local/nbproject/build-impl.xml --- a/remoting/ide/local/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/local/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/local/nbproject/genfiles.properties --- a/remoting/ide/local/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/local/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=c99d6905 build.xml.script.CRC32=cee246cf build.xml.stylesheet.CRC32=a56c6a5b@2.49 diff -r 205b7632914c -r 57843026e60b remoting/ide/local/nbproject/project.properties --- a/remoting/ide/local/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/local/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,2 +1,43 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b remoting/ide/local/nbproject/project.xml --- a/remoting/ide/local/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/local/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/ide/local/nbproject/suite.properties --- a/remoting/ide/local/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/local/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b remoting/ide/local/src/org/netbeans/modules/jackpot30/remoting/local/Bundle.properties --- a/remoting/ide/local/src/org/netbeans/modules/jackpot30/remoting/local/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/local/src/org/netbeans/modules/jackpot30/remoting/local/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Jackpot 3.0 Remoting - Local Server diff -r 205b7632914c -r 57843026e60b remoting/ide/nbproject/build-impl.xml --- a/remoting/ide/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/nbproject/genfiles.properties --- a/remoting/ide/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=891734f5 build.xml.script.CRC32=82b74f72 build.xml.stylesheet.CRC32=eaf9f76a@1.47 diff -r 205b7632914c -r 57843026e60b remoting/ide/nbproject/platform.properties --- a/remoting/ide/nbproject/platform.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/nbproject/platform.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. cluster.path=\ ${nbplatform.active.dir}/apisupport:\ ${nbplatform.active.dir}/cnd:\ diff -r 205b7632914c -r 57843026e60b remoting/ide/nbproject/platform.xml --- a/remoting/ide/nbproject/platform.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/nbproject/platform.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/nbproject/project.properties --- a/remoting/ide/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. modules=\ ${project.org.netbeans.modules.jackpot30.jumpto}:\ ${project.org.netbeans.modules.jackpot30.remoting.api}:\ diff -r 205b7632914c -r 57843026e60b remoting/ide/nbproject/project.xml --- a/remoting/ide/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project.suite diff -r 205b7632914c -r 57843026e60b remoting/ide/usages/build.xml --- a/remoting/ide/usages/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/usages/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/usages/nbproject/build-impl.xml --- a/remoting/ide/usages/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/usages/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/ide/usages/nbproject/genfiles.properties --- a/remoting/ide/usages/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/usages/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=e216ee19 build.xml.script.CRC32=58a6b47a build.xml.stylesheet.CRC32=a56c6a5b@2.49 diff -r 205b7632914c -r 57843026e60b remoting/ide/usages/nbproject/project.properties --- a/remoting/ide/usages/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/usages/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,2 +1,43 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b remoting/ide/usages/nbproject/project.xml --- a/remoting/ide/usages/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/usages/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/ide/usages/nbproject/suite.properties --- a/remoting/ide/usages/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/ide/usages/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b remoting/post-build.sh --- a/remoting/post-build.sh Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/post-build.sh Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ #!/bin/bash + +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + cp -r ../duplicates/server/indexer/build/cluster/* build/indexing-backend/indexer/indexer cp -r ../duplicates/ide/build/cluster/* build/indexing-backend/indexer/indexer cp -r ../remoting/ide/build/cluster/* build/indexing-backend/indexer/indexer diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/pom.xml --- a/remoting/server/hudson/pom.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/hudson/pom.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ + 4.0.0 Jackpot 3.0 Hudson Plugin diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/java/org/netbeans/modules/jackpot30/hudson/InstallIndexingTool.java --- a/remoting/server/hudson/src/main/java/org/netbeans/modules/jackpot30/hudson/InstallIndexingTool.java Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/hudson/src/main/java/org/netbeans/modules/jackpot30/hudson/InstallIndexingTool.java Mon Feb 27 22:40:44 2017 +0100 @@ -49,7 +49,9 @@ import hudson.tools.InstallSourceProperty; import hudson.tools.ToolInstallation; import hudson.tools.ToolProperty; +import java.io.ByteArrayInputStream; import java.io.IOException; +import java.io.InputStream; import java.util.Arrays; import org.kohsuke.stapler.DataBoundConstructor; @@ -84,12 +86,21 @@ } + private static final String INSTALLER_DESCRIPTION = + "{\"list\": [{\"id\": \"main\", \"name\": \"main\", \"url\": \"http://deadlock.netbeans.org/hudson/job/jackpot30/lastSuccessfulBuild/artifact/remoting/build/indexing-backend.zip\"}]}"; + //XXX: @Initializer(after=InitMilestone.JOB_LOADED) public static void prepareUpdates() throws IOException, InterruptedException { FilePath update = new FilePath(new FilePath(Hudson.getInstance().getRootPath(), "updates"), "org.netbeans.modules.jackpot30.hudson.InstallIndexingTool"); - update.copyFrom(InstallIndexingTool.class.getResource("org.netbeans.modules.jackpot30.hudson.InstallIndexingTool")); + InputStream in = new ByteArrayInputStream(INSTALLER_DESCRIPTION.getBytes()); + + try { + update.copyFrom(in); + } finally { + in.close(); + } //preinstall main tool if it does not exist: IndexingTool[] tools = Hudson.getInstance().getDescriptorByType(IndexingTool.DescriptorImpl.class).getInstallations(); diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/resources/index.jelly --- a/remoting/server/hudson/src/main/resources/index.jelly Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/hudson/src/main/resources/index.jelly Mon Feb 27 22:40:44 2017 +0100 @@ -1,7 +1,45 @@
Jackpot 3.0 Hudson plugin. diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/BuildWrapperImpl/config.jelly --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/BuildWrapperImpl/config.jelly Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - -
- - - - - - - - - - - - -
- - - - diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/BuildWrapperImpl/help-hardcodedHintsEnabled.html --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/BuildWrapperImpl/help-hardcodedHintsEnabled.html Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -
- Whether the standard NetBeans hints should be run during the build. -
\ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/config.jelly --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/config.jelly Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/config.jelly Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,47 @@ + + diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/global.jelly --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/global.jelly Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/global.jelly Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,47 @@ + + diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help-cacheDir.html --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help-cacheDir.html Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help-cacheDir.html Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +
Target cache directory.
\ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help-ignorePatterns.html --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help-ignorePatterns.html Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help-ignorePatterns.html Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +
Regular expression pattern for projects that should not be indexed.
\ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help-indexSubDirectory.html --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help-indexSubDirectory.html Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help-indexSubDirectory.html Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +
When non-empty, interpreted as a relative path to a directory inside workspace that should be indexed.
\ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help-projectName.html --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help-projectName.html Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help-projectName.html Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +
A name of the index. Will be shown to the user when selecting indexes to operate on.
\ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help.html --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help.html Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/IndexingBuilder/help.html Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +
Run indexers.
\ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/JackpotIndexBuilder/config.jelly --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/JackpotIndexBuilder/config.jelly Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ - - - diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/JackpotIndexBuilder/help.html --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/JackpotIndexBuilder/help.html Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -
- Run Jackpot 3.0 indexer. -
\ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/org.netbeans.modules.jackpot30.hudson.InstallIndexingTool --- a/remoting/server/hudson/src/main/resources/org/netbeans/modules/jackpot30/hudson/org.netbeans.modules.jackpot30.hudson.InstallIndexingTool Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -{"list": [{"id": "main", "name": "main", "url": "http://deadlock.netbeans.org/hudson/job/jackpot30/lastSuccessfulBuild/artifact/remoting/build/indexing-backend.zip"}]} \ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/hudson/src/main/webapp/help-globalConfig.html --- a/remoting/server/hudson/src/main/webapp/help-globalConfig.html Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/hudson/src/main/webapp/help-globalConfig.html Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ +

- See help-projectConfig.html for more about what these HTMLs do. + Configure indexers.

\ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/build.xml --- a/remoting/server/indexer/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/etc/app.conf --- a/remoting/server/indexer/etc/app.conf Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/etc/app.conf Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,45 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + # ${HOME} will be replaced by user home directory according to platform default_userdir="${HOME}/.${APPNAME}/dev" default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/dev" diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/impl/build.xml --- a/remoting/server/indexer/impl/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/impl/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/impl/nbproject/build-impl.xml --- a/remoting/server/indexer/impl/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/impl/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/impl/nbproject/genfiles.properties --- a/remoting/server/indexer/impl/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/impl/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=73a66b48 build.xml.script.CRC32=c32e03a8 build.xml.stylesheet.CRC32=a56c6a5b@1.47 diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/impl/nbproject/project.properties --- a/remoting/server/indexer/impl/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/impl/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial spec.version.base=1.1 diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/impl/nbproject/project.xml --- a/remoting/server/indexer/impl/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/impl/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/impl/nbproject/suite.properties --- a/remoting/server/indexer/impl/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/impl/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/impl/src/org/netbeans/modules/jackpot30/backend/impl/Bundle.properties --- a/remoting/server/indexer/impl/src/org/netbeans/modules/jackpot30/backend/impl/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/impl/src/org/netbeans/modules/jackpot30/backend/impl/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Jackpot 3.0 Backend Impl diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/nbproject/build-impl.xml --- a/remoting/server/indexer/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/nbproject/genfiles.properties --- a/remoting/server/indexer/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=7bd55f34 build.xml.script.CRC32=f378700b build.xml.stylesheet.CRC32=eaf9f76a@1.47 diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/nbproject/platform.properties --- a/remoting/server/indexer/nbproject/platform.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/nbproject/platform.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. cluster.path=\ ${nbplatform.active.dir}/apisupport:\ ${nbplatform.active.dir}/cnd:\ diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/nbproject/platform.xml --- a/remoting/server/indexer/nbproject/platform.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/nbproject/platform.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/nbproject/project.properties --- a/remoting/server/indexer/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. app.conf=etc/app.conf app.name=indexer branding.token=${app.name} diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/nbproject/project.xml --- a/remoting/server/indexer/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project.suite diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/source/build.xml --- a/remoting/server/indexer/source/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/source/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/source/nbproject/build-impl.xml --- a/remoting/server/indexer/source/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/source/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/source/nbproject/genfiles.properties --- a/remoting/server/indexer/source/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/source/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=006ca2fd build.xml.script.CRC32=aab17f8c build.xml.stylesheet.CRC32=a56c6a5b@2.45 diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/source/nbproject/project.properties --- a/remoting/server/indexer/source/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/source/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,2 +1,43 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/source/nbproject/project.xml --- a/remoting/server/indexer/source/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/source/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/source/nbproject/suite.properties --- a/remoting/server/indexer/source/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/source/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/source/src/org/netbeans/modules/jackpot30/indexer/source/Bundle.properties --- a/remoting/server/indexer/source/src/org/netbeans/modules/jackpot30/indexer/source/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/source/src/org/netbeans/modules/jackpot30/indexer/source/Bundle.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. OpenIDE-Module-Name=Jackpot 3.0 Source Indexer diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/usages/build.xml --- a/remoting/server/indexer/usages/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/usages/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/usages/nbproject/build-impl.xml --- a/remoting/server/indexer/usages/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/usages/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/usages/nbproject/genfiles.properties --- a/remoting/server/indexer/usages/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/usages/nbproject/genfiles.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. build.xml.data.CRC32=80410336 build.xml.script.CRC32=4ae79e41 build.xml.stylesheet.CRC32=a56c6a5b@2.47 diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/usages/nbproject/project.properties --- a/remoting/server/indexer/usages/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/usages/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,2 +1,43 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/usages/nbproject/project.xml --- a/remoting/server/indexer/usages/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/usages/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.apisupport.project diff -r 205b7632914c -r 57843026e60b remoting/server/indexer/usages/nbproject/suite.properties --- a/remoting/server/indexer/usages/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/indexer/usages/nbproject/suite.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b remoting/server/scripts/index.sh --- a/remoting/server/scripts/index.sh Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/scripts/index.sh Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,45 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + DIR=`dirname $0` USERDIR=`mktemp -d`; trap "rm -rf -- '$USERDIR'" EXIT diff -r 205b7632914c -r 57843026e60b remoting/server/scripts/web.sh --- a/remoting/server/scripts/web.sh Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/scripts/web.sh Mon Feb 27 22:40:44 2017 +0100 @@ -1,8 +1,51 @@ #!/bin/bash + +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + #XXX: unix only DIR=$(readlink -m `dirname $0`) classpath="$DIR/web/web.main.jar" for jar in $DIR/web/lib/*.jar; do classpath="$classpath:$jar" done -exec java $JACKPOT_WEB_OPTS -Djava.index.useMemCache=false -Xbootclasspath/p:$DIR/web/lib/nb-javac-api.jar:$DIR/web/lib/nb-javac-impl.jar -classpath "$classpath" web.main.WebMain "$@" "$DIR/web/public_html" +exec java $JACKPOT_WEB_OPTS -Djava.index.useMemCache=false -Xbootclasspath/p:$DIR/web/lib/nb-javac-api.jar:$DIR/web/lib/nb-javac-impl.jar -classpath "$classpath" org.netbeans.modules.jackpot30.backend.main.WebMain "$@" "$DIR/web/public_html" diff -r 205b7632914c -r 57843026e60b remoting/server/tests/data/group1/prj1/build.xml --- a/remoting/server/tests/data/group1/prj1/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/data/group1/prj1/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/tests/data/group1/prj1/nbproject/build-impl.xml --- a/remoting/server/tests/data/group1/prj1/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/data/group1/prj1/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + org.netbeans.modules.java.j2seproject diff -r 205b7632914c -r 57843026e60b remoting/server/tests/data/group1/prj1/src/project1/A.java --- a/remoting/server/tests/data/group1/prj1/src/project1/A.java Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/data/group1/prj1/src/project1/A.java Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ package project1; public class A { diff -r 205b7632914c -r 57843026e60b remoting/server/tests/data/group1/prj1/src/project1/B.java --- a/remoting/server/tests/data/group1/prj1/src/project1/B.java Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/data/group1/prj1/src/project1/B.java Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ package project1; public class B { diff -r 205b7632914c -r 57843026e60b remoting/server/tests/integration-data/example/build.xml --- a/remoting/server/tests/integration-data/example/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/integration-data/example/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/tests/integration-data/example/nbproject/build-impl.xml --- a/remoting/server/tests/integration-data/example/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/integration-data/example/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + org.netbeans.modules.java.j2seproject diff -r 205b7632914c -r 57843026e60b remoting/server/tests/integration-data/example/src/org/netbeans/modules/jackpot30/example/ClassA.java --- a/remoting/server/tests/integration-data/example/src/org/netbeans/modules/jackpot30/example/ClassA.java Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/integration-data/example/src/org/netbeans/modules/jackpot30/example/ClassA.java Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ package org.netbeans.modules.jackpot30.example; public class ClassA { diff -r 205b7632914c -r 57843026e60b remoting/server/tests/integration-data/example/src/org/netbeans/modules/jackpot30/example/SubClassA.java --- a/remoting/server/tests/integration-data/example/src/org/netbeans/modules/jackpot30/example/SubClassA.java Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/integration-data/example/src/org/netbeans/modules/jackpot30/example/SubClassA.java Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ package org.netbeans.modules.jackpot30.example; public class SubClassA extends ClassA { diff -r 205b7632914c -r 57843026e60b remoting/server/tests/integration-data/example/src/org/netbeans/modules/jackpot30/example/UseClassA.java --- a/remoting/server/tests/integration-data/example/src/org/netbeans/modules/jackpot30/example/UseClassA.java Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/integration-data/example/src/org/netbeans/modules/jackpot30/example/UseClassA.java Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ package org.netbeans.modules.jackpot30.example; public class UseClassA { diff -r 205b7632914c -r 57843026e60b remoting/server/tests/integration/pom.xml --- a/remoting/server/tests/integration/pom.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/integration/pom.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ + 4.0.0 diff -r 205b7632914c -r 57843026e60b remoting/server/tests/run-declarative-tests --- a/remoting/server/tests/run-declarative-tests Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/run-declarative-tests Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ #!/bin/bash -x + +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + do_index() { rm -rf cache mkdir -p cache @@ -54,7 +97,7 @@ mkdir results for tc in `find testcases -name "*.tc" -type d`; do - REQUEST=`cat $tc/request`; + REQUEST=`cat $tc/request | grep -v '^#'`; TEST_NAME=`echo ${tc#testcases/} | tr '/' '-'`; RESULT_FILE="`pwd`/results/TEST-$TEST_NAME.xml" if wget -O - "http://localhost:${PORT}$REQUEST" | diff -w - $tc/response; then diff -r 205b7632914c -r 57843026e60b remoting/server/tests/run-integration-tests --- a/remoting/server/tests/run-integration-tests Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/run-integration-tests Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ #!/bin/bash -x + +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + exit 0 #TODO - OverallTest is failing do_index() { diff -r 205b7632914c -r 57843026e60b remoting/server/tests/testcases/list.tc/request --- a/remoting/server/tests/testcases/list.tc/request Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/testcases/list.tc/request Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. /index/list \ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/tests/testcases/sources/simple.tc/request --- a/remoting/server/tests/testcases/sources/simple.tc/request Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/testcases/sources/simple.tc/request Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. /index/source/cat?path=group1&relative=prj1/src/project1/A.java \ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/tests/testcases/symbol/symbol-lookup1.tc/request --- a/remoting/server/tests/testcases/symbol/symbol-lookup1.tc/request Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/testcases/symbol/symbol-lookup1.tc/request Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. /index/symbol/search?path=group1&prefix=tes diff -r 205b7632914c -r 57843026e60b remoting/server/tests/testcases/type/lookup1.tc/request --- a/remoting/server/tests/testcases/type/lookup1.tc/request Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/testcases/type/lookup1.tc/request Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. /index/type/search?path=group1&prefix=A diff -r 205b7632914c -r 57843026e60b remoting/server/tests/testcases/usages/field-new.tc/request --- a/remoting/server/tests/testcases/usages/field-new.tc/request Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/testcases/usages/field-new.tc/request Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. /index/usages/search?path=group1&signatures=FIELD:project1.B:F \ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/tests/testcases/usages/field-old.tc/request --- a/remoting/server/tests/testcases/usages/field-old.tc/request Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/testcases/usages/field-old.tc/request Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. /index/usages/search?path=group1&signatures=FIELD:project1.B:F:I \ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/tests/testcases/usages/usages-simple.tc/request --- a/remoting/server/tests/testcases/usages/usages-simple.tc/request Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/tests/testcases/usages/usages-simple.tc/request Mon Feb 27 22:40:44 2017 +0100 @@ -1,1 +1,42 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. /index/usages/search?path=group1&signatures=METHOD:project1.B:test:()V \ No newline at end of file diff -r 205b7632914c -r 57843026e60b remoting/server/web/base.web.api/build.xml --- a/remoting/server/web/base.web.api/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/base.web.api/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/web/base.web.api/nbproject/build-impl.xml --- a/remoting/server/web/base.web.api/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/base.web.api/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + org.netbeans.modules.java.j2seproject diff -r 205b7632914c -r 57843026e60b remoting/server/web/nbindex.web.api/build.xml --- a/remoting/server/web/nbindex.web.api/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/nbindex.web.api/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/web/nbindex.web.api/nbproject/build-impl.xml --- a/remoting/server/web/nbindex.web.api/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/nbindex.web.api/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + org.netbeans.modules.java.j2seproject diff -r 205b7632914c -r 57843026e60b remoting/server/web/resolve.web.api/build.xml --- a/remoting/server/web/resolve.web.api/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/resolve.web.api/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/web/resolve.web.api/nbproject/build-impl.xml --- a/remoting/server/web/resolve.web.api/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/resolve.web.api/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + org.netbeans.modules.java.j2seproject diff -r 205b7632914c -r 57843026e60b remoting/server/web/source.web.api/build.xml --- a/remoting/server/web/source.web.api/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/source.web.api/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/web/source.web.api/nbproject/build-impl.xml --- a/remoting/server/web/source.web.api/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/source.web.api/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + org.netbeans.modules.java.j2seproject diff -r 205b7632914c -r 57843026e60b remoting/server/web/type.web.api/build.xml --- a/remoting/server/web/type.web.api/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/type.web.api/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/web/type.web.api/nbproject/build-impl.xml --- a/remoting/server/web/type.web.api/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/type.web.api/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + org.netbeans.modules.java.j2seproject diff -r 205b7632914c -r 57843026e60b remoting/server/web/usages.web.api/build.xml --- a/remoting/server/web/usages.web.api/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/usages.web.api/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/web/usages.web.api/nbproject/build-impl.xml --- a/remoting/server/web/usages.web.api/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/usages.web.api/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + org.netbeans.modules.java.j2seproject diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.main/build.xml --- a/remoting/server/web/web.main/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.main/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.main/nbproject/build-impl.xml --- a/remoting/server/web/web.main/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.main/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + org.netbeans.modules.java.j2seproject diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.main/src/org/netbeans/modules/jackpot30/backend/main/MainPage.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/remoting/server/web/web.main/src/org/netbeans/modules/jackpot30/backend/main/MainPage.java Mon Feb 27 22:40:44 2017 +0100 @@ -0,0 +1,60 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2011-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2011 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.jackpot30.backend.main; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; + +/** + * + * @author lahvac + */ +@Path("/") +public class MainPage { + + @GET + public String main() { + //XXX: should be constructed automatically from installed plugins + return ""; + } +} diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.main/src/org/netbeans/modules/jackpot30/backend/main/WebMain.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/remoting/server/web/web.main/src/org/netbeans/modules/jackpot30/backend/main/WebMain.java Mon Feb 27 22:40:44 2017 +0100 @@ -0,0 +1,165 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2011-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2011 Sun Microsystems, Inc. + */ +package org.netbeans.modules.jackpot30.backend.main; + +import com.sun.grizzly.http.embed.GrizzlyWebServer; +import com.sun.grizzly.http.servlet.ServletAdapter; +import com.sun.grizzly.tcp.http11.GrizzlyAdapter; +import com.sun.grizzly.tcp.http11.GrizzlyOutputStream; +import com.sun.grizzly.tcp.http11.GrizzlyRequest; +import com.sun.grizzly.tcp.http11.GrizzlyResponse; +import com.sun.jersey.spi.container.servlet.ServletContainer; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.InetAddress; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.netbeans.modules.jackpot30.backend.base.AccessStatistics; +import org.netbeans.modules.jackpot30.backend.base.CategoryStorage; +import org.netbeans.modules.jackpot30.backend.base.RelStreamHandlerFactory; +import org.openide.util.Exceptions; + +/** + * + * @author lahvac + */ +public class WebMain { + + /** + * @param args the command line arguments + */ + public static void main(String... origArgs) throws IOException, InterruptedException { + int port = 9998; + + List args = new ArrayList(Arrays.asList(origArgs)); + + if (args.size() > 1 && "--port".equals(args.get(0))) { + args.remove(0); + port = Integer.parseInt(args.remove(0)); + } + + if (args.size() != 1 && args.size() != 2) { + System.err.println("Usage: java -jar " + WebMain.class.getProtectionDomain().getCodeSource().getLocation().getPath() + " [--port ] []"); + return ; + } + + CategoryStorage.setCacheRoot(new File(args.get(0))); + +// org.netbeans.ProxyURLStreamHandlerFactory.register(); + URL.setURLStreamHandlerFactory(new RelStreamHandlerFactory()); + + GrizzlyWebServer gws; + + if (args.size() == 2) { + gws = new GrizzlyWebServer(port, args.get(1)); + } else { + gws = new GrizzlyWebServer(port); + } + + if (port == 0) { + gws.getSelectorThread().setAddress(InetAddress.getByName("localhost")); + } + + // Jersey web resources + ServletAdapter jerseyAdapter = new ServletAdapter(); + jerseyAdapter.addInitParameter("com.sun.jersey.config.property.packages", "org.netbeans.modules.jackpot30"); + jerseyAdapter.addInitParameter("com.sun.jersey.spi.container.ContainerRequestFilters", AccessStatistics.class.getName()); +// jerseyAdapter.setContextPath("/"); + jerseyAdapter.setServletInstance(new ServletContainer()); + + // register all above defined adapters + gws.addGrizzlyAdapter(new GrizzlyAdapter(){ + public void service(GrizzlyRequest request, GrizzlyResponse response){ + if (request.getRequestURI().contains("/index/icons/")) { + String icon = request.getRequestURI().substring("/index".length()); + URL iconURL = WebMain.class.getResource(icon); + + if (iconURL == null) return; + + InputStream in = null; + GrizzlyOutputStream out = null; + + try { + in = iconURL.openStream(); + out = response.createOutputStream(); + + int read; + + while ((read = in.read()) != (-1)) { + out.write(read); + } + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + } finally { + if (in != null) { + try { + in.close(); + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + } + } + if (out != null) { + try { + out.close(); + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + } + } + } + } + response.setStatus(404); + } + }); + gws.addGrizzlyAdapter(jerseyAdapter); + + // let Grizzly run + gws.start(); + + if (port == 0) { + System.out.println("Running on port: " + gws.getSelectorThread().getPortLowLevel()); + } + } + +} diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.main/src/web/main/MainPage.java --- a/remoting/server/web/web.main/src/web/main/MainPage.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2011 Sun Microsystems, Inc. - */ - -package web.main; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; - -/** - * - * @author lahvac - */ -@Path("/") -public class MainPage { - - @GET - public String main() { - //XXX: should be constructed automatically from installed plugins - return ""; - } -} diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.main/src/web/main/WebMain.java --- a/remoting/server/web/web.main/src/web/main/WebMain.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,165 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2011 Sun Microsystems, Inc. - */ -package web.main; - -import com.sun.grizzly.http.embed.GrizzlyWebServer; -import com.sun.grizzly.http.servlet.ServletAdapter; -import com.sun.grizzly.tcp.http11.GrizzlyAdapter; -import com.sun.grizzly.tcp.http11.GrizzlyOutputStream; -import com.sun.grizzly.tcp.http11.GrizzlyRequest; -import com.sun.grizzly.tcp.http11.GrizzlyResponse; -import com.sun.jersey.spi.container.servlet.ServletContainer; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.InetAddress; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import org.netbeans.modules.jackpot30.backend.base.AccessStatistics; -import org.netbeans.modules.jackpot30.backend.base.CategoryStorage; -import org.netbeans.modules.jackpot30.backend.base.RelStreamHandlerFactory; -import org.openide.util.Exceptions; - -/** - * - * @author lahvac - */ -public class WebMain { - - /** - * @param args the command line arguments - */ - public static void main(String... origArgs) throws IOException, InterruptedException { - int port = 9998; - - List args = new ArrayList(Arrays.asList(origArgs)); - - if (args.size() > 1 && "--port".equals(args.get(0))) { - args.remove(0); - port = Integer.parseInt(args.remove(0)); - } - - if (args.size() != 1 && args.size() != 2) { - System.err.println("Usage: java -jar " + WebMain.class.getProtectionDomain().getCodeSource().getLocation().getPath() + " [--port ] []"); - return ; - } - - CategoryStorage.setCacheRoot(new File(args.get(0))); - -// org.netbeans.ProxyURLStreamHandlerFactory.register(); - URL.setURLStreamHandlerFactory(new RelStreamHandlerFactory()); - - GrizzlyWebServer gws; - - if (args.size() == 2) { - gws = new GrizzlyWebServer(port, args.get(1)); - } else { - gws = new GrizzlyWebServer(port); - } - - if (port == 0) { - gws.getSelectorThread().setAddress(InetAddress.getByName("localhost")); - } - - // Jersey web resources - ServletAdapter jerseyAdapter = new ServletAdapter(); - jerseyAdapter.addInitParameter("com.sun.jersey.config.property.packages", "org.netbeans.modules.jackpot30"); - jerseyAdapter.addInitParameter("com.sun.jersey.spi.container.ContainerRequestFilters", AccessStatistics.class.getName()); -// jerseyAdapter.setContextPath("/"); - jerseyAdapter.setServletInstance(new ServletContainer()); - - // register all above defined adapters - gws.addGrizzlyAdapter(new GrizzlyAdapter(){ - public void service(GrizzlyRequest request, GrizzlyResponse response){ - if (request.getRequestURI().contains("/index/icons/")) { - String icon = request.getRequestURI().substring("/index".length()); - URL iconURL = WebMain.class.getResource(icon); - - if (iconURL == null) return; - - InputStream in = null; - GrizzlyOutputStream out = null; - - try { - in = iconURL.openStream(); - out = response.createOutputStream(); - - int read; - - while ((read = in.read()) != (-1)) { - out.write(read); - } - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } finally { - if (in != null) { - try { - in.close(); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - } - if (out != null) { - try { - out.close(); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - } - } - } - response.setStatus(404); - } - }); - gws.addGrizzlyAdapter(jerseyAdapter); - - // let Grizzly run - gws.start(); - - if (port == 0) { - System.out.println("Running on port: " + gws.getSelectorThread().getPortLowLevel()); - } - } - -} diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui.frontend/config/jsTestDriver.conf --- a/remoting/server/web/web.ui.frontend/config/jsTestDriver.conf Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.ui.frontend/config/jsTestDriver.conf Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,45 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + server: http://localhost:42442 load: diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui.frontend/download.xml --- a/remoting/server/web/web.ui.frontend/download.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.ui.frontend/download.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui.frontend/nbproject/project.properties --- a/remoting/server/web/web.ui.frontend/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.ui.frontend/nbproject/project.properties Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,44 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. browser.autorefresh.SL__Browsers_ChromeBrowser=true browser.highlightselection.SL__Browsers_ChromeBrowser=true config.folder=${file.reference.js-frontend-config} diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui.frontend/nbproject/project.xml --- a/remoting/server/web/web.ui.frontend/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.ui.frontend/nbproject/project.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + org.netbeans.modules.web.clientproject diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui.frontend/public_html/index/ui/index.html --- a/remoting/server/web/web.ui.frontend/public_html/index/ui/index.html Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.ui.frontend/public_html/index/ui/index.html Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui.frontend/public_html/index/ui/script.js --- a/remoting/server/web/web.ui.frontend/public_html/index/ui/script.js Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.ui.frontend/public_html/index/ui/script.js Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,47 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ + function IndexDeclarationSearch($scope, $location, $http, $routeParams, $route) { DeclarationSearch($scope, $location, $http, $routeParams, $route); $scope.performQuery = function() { diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui.frontend/public_html/index/ui/search.html --- a/remoting/server/web/web.ui.frontend/public_html/index/ui/search.html Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.ui.frontend/public_html/index/ui/search.html Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +
diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui.frontend/public_html/index/ui/showCode.html --- a/remoting/server/web/web.ui.frontend/public_html/index/ui/showCode.html Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.ui.frontend/public_html/index/ui/showCode.html Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ +
diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui.frontend/public_html/index/ui/usages.html --- a/remoting/server/web/web.ui.frontend/public_html/index/ui/usages.html Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.ui.frontend/public_html/index/ui/usages.html Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,46 @@ + References to {{symbolDisplayName}} found in the following files:
diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui.frontend/test/unit/index/ui/script-test.js --- a/remoting/server/web/web.ui.frontend/test/unit/index/ui/script-test.js Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.ui.frontend/test/unit/index/ui/script-test.js Mon Feb 27 22:40:44 2017 +0100 @@ -1,3 +1,47 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2009-2017 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 2009-2010 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ + HighlightingTest = TestCase("HighlightingTest"); HighlightingTest.prototype.testHighlighting = function() { diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui/build.xml --- a/remoting/server/web/web.ui/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.ui/build.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,4 +1,47 @@ + diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui/nbproject/build-impl.xml --- a/remoting/server/web/web.ui/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ b/remoting/server/web/web.ui/nbproject/build-impl.xml Mon Feb 27 22:40:44 2017 +0100 @@ -1,5 +1,48 @@ + org.netbeans.modules.java.j2seproject diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui/src/org/netbeans/modules/jackpot30/backend/ui/highlighting/ColoringAttributes.diff --- a/remoting/server/web/web.ui/src/org/netbeans/modules/jackpot30/backend/ui/highlighting/ColoringAttributes.diff Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -44c44 -< package org.netbeans.modules.java.editor.semantic; ---- -> package org.netbeans.modules.jackpot30.backend.ui.highlighting; diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui/src/org/netbeans/modules/jackpot30/backend/ui/highlighting/SemanticHighlighter.diff --- a/remoting/server/web/web.ui/src/org/netbeans/modules/jackpot30/backend/ui/highlighting/SemanticHighlighter.diff Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,354 +0,0 @@ -44c44 -< package org.netbeans.modules.java.editor.semantic; ---- -> package org.netbeans.modules.jackpot30.backend.ui.highlighting; -84c84,86 -< import java.io.IOException; ---- -> import com.sun.source.util.TreePathScanner; -> import com.sun.tools.javac.tree.JCTree; -> import com.sun.tools.javac.tree.JCTree.JCVariableDecl; -94,96d95 -< import java.util.concurrent.atomic.AtomicBoolean; -< import java.util.logging.Level; -< import java.util.logging.Logger; -102,109d100 -< import javax.swing.SwingUtilities; -< import javax.swing.text.Document; -< import org.netbeans.api.java.source.CompilationInfo; -< import org.netbeans.api.java.source.JavaParserResultTask; -< import org.netbeans.api.java.source.JavaSource.Phase; -< import org.netbeans.api.java.source.TreePathHandle; -< import org.netbeans.api.java.source.TreeUtilities; -< import org.netbeans.api.java.source.support.CancellableTreePathScanner; -111,123c102,103 -< import org.netbeans.api.lexer.TokenHierarchy; -< import org.netbeans.modules.editor.NbEditorUtilities; -< import org.netbeans.modules.java.editor.imports.UnusedImports; -< import org.netbeans.modules.java.editor.semantic.ColoringAttributes.Coloring; -< import org.netbeans.modules.parsing.spi.Parser.Result; -< import org.netbeans.modules.parsing.spi.Scheduler; -< import org.netbeans.modules.parsing.spi.SchedulerEvent; -< import org.netbeans.modules.parsing.spi.TaskIndexingMode; -< import org.netbeans.spi.editor.highlighting.support.OffsetsBag; -< import org.netbeans.spi.editor.hints.ErrorDescription; -< import org.openide.filesystems.FileObject; -< import org.openide.filesystems.FileUtil; -< import org.openide.loaders.DataObject; ---- -> import org.netbeans.modules.jackpot30.backend.ui.highlighting.ColoringAttributes.Coloring; -> import org.netbeans.modules.jackpot30.resolve.api.CompilationInfo; -130,214c110 -< public class SemanticHighlighter extends JavaParserResultTask { -< -< public static List computeUnusedImports(CompilationInfo info) throws IOException { -< final List result = new ArrayList(); -< -< for (TreePath unused : UnusedImports.process(info, new AtomicBoolean())) { -< result.add(TreePathHandle.create(unused, info)); -< } -< -< return result; -< } -< -< private FileObject file; -< //XXX: correct rescheduling when troubles traversing token list! -< // private SemanticHighlighterFactory fact; -< private AtomicBoolean cancel = new AtomicBoolean(); -< -< // SemanticHighlighter(FileObject file) { -< // this(file, null); -< // } -< // -< SemanticHighlighter(FileObject file/*, SemanticHighlighterFactory fact*/) { -< super(Phase.RESOLVED, TaskIndexingMode.ALLOWED_DURING_SCAN); -< this.file = file; -< // this.fact = fact; -< } -< -< @Override -< public void run(Result result, SchedulerEvent event) { -< CompilationInfo info = CompilationInfo.get(result); -< -< if (info == null) { -< return ; -< } -< -< cancel.set(false); -< -< final Document doc = result.getSnapshot().getSource().getDocument(false); -< -< if (!verifyDocument(doc)) return; -< -< if (process(info, doc)/* && fact != null*/) { -< // fact.rescheduleImpl(file); -< } -< } -< -< private static boolean verifyDocument(final Document doc) { -< if (doc == null) { -< Logger.getLogger(SemanticHighlighter.class.getName()).log(Level.FINE, "SemanticHighlighter: Cannot get document!"); -< return false; -< } -< -< final boolean[] tokenSequenceNull = new boolean[1]; -< doc.render(new Runnable() { -< public void run() { -< tokenSequenceNull[0] = (TokenHierarchy.get(doc).tokenSequence() == null); -< } -< }); -< if (tokenSequenceNull[0]) { -< return false; -< } -< -< return true; -< } -< -< public void cancel() { -< cancel.set(true); -< } -< -< -< @Override -< public int getPriority() { -< return 100; -< } -< -< @Override -< public Class getSchedulerClass() { -< return Scheduler.EDITOR_SENSITIVE_TASK_SCHEDULER; -< } -< -< -< -< boolean process(CompilationInfo info, final Document doc) { -< return process(info, doc, ERROR_DESCRIPTION_SETTER); -< } ---- -> public class SemanticHighlighter { -218c114 -< ---- -> -222c118 -< ---- -> -225,227c121,123 -< -< boolean process(CompilationInfo info, final Document doc, ErrorDescriptionSetter setter) { -< DetectorVisitor v = new DetectorVisitor(info, doc, cancel); ---- -> -> public static Map computeHighlights(CompilationInfo info, TokenList tl) { -> DetectorVisitor v = new DetectorVisitor(info, tl); -232d127 -< List errors = new ArrayList(); -238,269c133 -< if (cancel.get()) -< return true; -< -< boolean computeUnusedImports = "text/x-java".equals(FileUtil.getMIMEType(info.getFileObject())); -< -< final List allUnusedImports = computeUnusedImports ? new ArrayList() : null; -< OffsetsBag imports = computeUnusedImports ? new OffsetsBag(doc) : null; -< -< if (computeUnusedImports) { -< Coloring unused = ColoringAttributes.add(ColoringAttributes.empty(), ColoringAttributes.UNUSED); -< Collection unusedImports = UnusedImports.process(info, cancel); -< -< if (unusedImports == null) return true; -< -< for (TreePath tree : unusedImports) { -< if (cancel.get()) { -< return true; -< } -< -< //XXX: finish -< final int startPos = (int) info.getTrees().getSourcePositions().getStartPosition(cu, tree.getLeaf()); -< final int endPos = (int) info.getTrees().getSourcePositions().getEndPosition(cu, tree.getLeaf()); -< -< imports.addHighlight(startPos, endPos, ColoringManager.getColoringImpl(unused)); -< -< TreePathHandle handle = TreePathHandle.create(tree, info); -< -< allUnusedImports.add(handle); -< } -< } -< -< Map oldColors = LexerBasedHighlightLayer.getLayer(SemanticHighlighter.class, doc).getColorings(); ---- -> Map oldColors = new HashMap(); -274,276d137 -< if (cancel.get()) -< return true; -< -283c144 -< if (u.type.contains(UseTypes.DECLARATION) && org.netbeans.modules.java.editor.semantic.Utilities.isPrivateElement(decl)) { ---- -> if (u.type.contains(UseTypes.DECLARATION) && isPrivateElement(decl)) { -319,332c180 -< if (cancel.get()) -< return true; -< -< if (computeUnusedImports) { -< setter.setErrors(doc, errors, allUnusedImports); -< setter.setHighlights(doc, imports); -< } -< -< setter.setColorings(doc, newColoring, addedTokens, removedTokens.keySet()); -< -< Logger.getLogger("TIMER").log(Level.FINE, "Semantic", -< new Object[] {NbEditorUtilities.getFileObject(doc), System.currentTimeMillis() - start}); -< -< return false; ---- -> return newColoring; -336c184 -< private boolean hasAllTypes(List uses, Collection types) { ---- -> private static boolean hasAllTypes(List uses, Collection types) { -389c237 -< private static class DetectorVisitor extends CancellableTreePathScanner> { ---- -> private static class DetectorVisitor extends TreePathScanner> { -391,392c239 -< private org.netbeans.api.java.source.CompilationInfo info; -< private Document doc; ---- -> private CompilationInfo info; -402,404c249 -< private DetectorVisitor(org.netbeans.api.java.source.CompilationInfo info, final Document doc, AtomicBoolean cancel) { -< super(cancel); -< ---- -> private DetectorVisitor(CompilationInfo info, TokenList tl) { -406d250 -< this.doc = doc; -411c255 -< tl = new TokenList(info, doc, cancel); ---- -> this.tl = tl; -601c445 -< if (Utilities.isKeyword(expr.getLeaf())) { ---- -> if (isKeyword(expr.getLeaf())) { -806c650 -< if (info.getTreeUtilities().isSynthetic(getCurrentPath())) ---- -> if (isSynthetic(getCurrentPath())) -834c678 -< if (info.getTreeUtilities().isSynthetic(getCurrentPath())) { ---- -> if (isSynthetic(getCurrentPath())) { -886c730 -< while (tp != null && !TreeUtilities.CLASS_TREE_KINDS.contains(tp.getLeaf().getKind())) { ---- -> while (tp != null && !CLASS_TREE_KINDS.contains(tp.getLeaf().getKind())) { -890c734 -< if (tp != null && TreeUtilities.CLASS_TREE_KINDS.contains(tp.getLeaf().getKind())) { ---- -> if (tp != null && CLASS_TREE_KINDS.contains(tp.getLeaf().getKind())) { -1003c847 -< int[] span = info.getTreeUtilities().findNameSpan(tree); ---- -> int[] span = new int[] {((JCVariableDecl) tree).pos, ((JCVariableDecl) tree).pos + tree.getName().length()};//info.getTreeUtilities().findNameSpan(tree); -1313,1317c1157,1160 -< public static interface ErrorDescriptionSetter { -< -< public void setErrors(Document doc, List errors, List allUnusedImports); -< public void setHighlights(Document doc, OffsetsBag highlights); -< public void setColorings(Document doc, Map colorings, Set addedTokens, Set removedTokens); ---- -> -> //not fully correct, but should suffice now: -> private static boolean isSynthetic(TreePath path) { -> return ((JCTree) path.getLeaf()).pos == (-1); -1319,1329c1162,1185 -< -< static ErrorDescriptionSetter ERROR_DESCRIPTION_SETTER = new ErrorDescriptionSetter() { -< -< public void setErrors(Document doc, List errors, List allUnusedImports) {} -< -< public void setHighlights(final Document doc, final OffsetsBag highlights) { -< SwingUtilities.invokeLater(new Runnable() { -< public void run() { -< getImportHighlightsBag(doc).setHighlights(highlights); -< } -< }); ---- -> -> //from semantic.Utilities: -> private static final Set keywords; -> private static final Set nonCtorKeywords; -> -> static { -> keywords = new HashSet(); -> -> keywords.add("true"); -> keywords.add("false"); -> keywords.add("null"); -> keywords.add("this"); -> keywords.add("super"); -> keywords.add("class"); -> -> nonCtorKeywords = new HashSet(keywords); -> nonCtorKeywords.remove("this"); -> nonCtorKeywords.remove("super"); -> -> } -> -> public static boolean isKeyword(Tree tree) { -> if (tree.getKind() == Kind.IDENTIFIER) { -> return keywords.contains(((IdentifierTree) tree).getName().toString()); -1331,1337c1187,1188 -< -< public void setColorings(final Document doc, final Map colorings, final Set addedTokens, final Set removedTokens) { -< SwingUtilities.invokeLater(new Runnable () { -< public void run() { -< LexerBasedHighlightLayer.getLayer(SemanticHighlighter.class, doc).setColorings(colorings, addedTokens, removedTokens); -< } -< }); ---- -> if (tree.getKind() == Kind.MEMBER_SELECT) { -> return keywords.contains(((MemberSelectTree) tree).getIdentifier().toString()); -1339d1189 -< }; -1341,1352c1191,1196 -< private static final Object KEY_UNUSED_IMPORTS = new Object(); -< static OffsetsBag getImportHighlightsBag(Document doc) { -< OffsetsBag bag = (OffsetsBag) doc.getProperty(KEY_UNUSED_IMPORTS); -< -< if (bag == null) { -< doc.putProperty(KEY_UNUSED_IMPORTS, bag = new OffsetsBag(doc)); -< -< Object stream = doc.getProperty(Document.StreamDescriptionProperty); -< -< if (stream instanceof DataObject) { -< // TimesCollector.getDefault().reportReference(((DataObject) stream).getPrimaryFile(), "ImportsHighlightsBag", "[M] Imports Highlights Bag", bag); -< } ---- -> return false; -> } -> -> public static boolean isNonCtorKeyword(Tree tree) { -> if (tree.getKind() == Kind.IDENTIFIER) { -> return nonCtorKeywords.contains(((IdentifierTree) tree).getName().toString()); -1354,1355c1198,1208 -< -< return bag; ---- -> if (tree.getKind() == Kind.MEMBER_SELECT) { -> return nonCtorKeywords.contains(((MemberSelectTree) tree).getIdentifier().toString()); -> } -> -> return false; -> } -> -> private static final Set LOCAL_ELEMENT_KINDS = EnumSet.of(ElementKind.PARAMETER, ElementKind.LOCAL_VARIABLE, ElementKind.EXCEPTION_PARAMETER, ElementKind.RESOURCE_VARIABLE); -> -> public static boolean isPrivateElement(Element el) { -> return LOCAL_ELEMENT_KINDS.contains(el.getKind()) || el.getModifiers().contains(Modifier.PRIVATE); -1357a1211,1212 -> //from TreeUtilities: -> public static final Set CLASS_TREE_KINDS = EnumSet.of(Kind.ANNOTATION_TYPE, Kind.CLASS, Kind.ENUM, Kind.INTERFACE); diff -r 205b7632914c -r 57843026e60b remoting/server/web/web.ui/src/org/netbeans/modules/jackpot30/backend/ui/highlighting/TokenList.diff --- a/remoting/server/web/web.ui/src/org/netbeans/modules/jackpot30/backend/ui/highlighting/TokenList.diff Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,145 +0,0 @@ -31c31 -< package org.netbeans.modules.java.editor.semantic; ---- -> package org.netbeans.modules.jackpot30.backend.ui.highlighting; -39d38 -< import java.util.ArrayList; -41,42d39 -< import java.util.Collections; -< import java.util.Iterator; -46d42 -< import javax.swing.text.Document; -48d43 -< import org.netbeans.api.java.source.CompilationInfo; -50,51d44 -< import org.netbeans.api.lexer.TokenHierarchy; -< import org.netbeans.api.lexer.TokenId; -52a46 -> import org.netbeans.modules.jackpot30.resolve.api.CompilationInfo; -62d55 -< private Document doc; -65,66d57 -< private boolean topLevelIsJava; -< private TokenSequence topLevel; -69c60 -< public TokenList(CompilationInfo info, final Document doc, AtomicBoolean cancel) { ---- -> public TokenList(CompilationInfo info, TokenSequence topLevel, AtomicBoolean cancel) { -71d61 -< this.doc = doc; -76,77d65 -< doc.render(new Runnable() { -< public void run() { -81c69 -< topLevel = TokenHierarchy.get(doc).tokenSequence(); ---- -> assert topLevel.language() == JavaTokenId.language(); -83,85d70 -< topLevelIsJava = topLevel.language() == JavaTokenId.language(); -< -< if (topLevelIsJava) { -89,91d73 -< } -< } -< }); -95c77 -< final int offset = info.getSnapshot().getOriginalOffset((int) inputOffset); ---- -> final int offset = (int) inputOffset; -99,100d80 -< doc.render(new Runnable() { -< public void run() { -108,109c88 -< -< if (topLevelIsJava) { ---- -> -114,148d92 -< } else { -< Iterator embeddedSeqs = null; -< if (ts == null) { -< List seqs = new ArrayList(embeddedTokenSequences(TokenHierarchy.get(doc), offset)); -< Collections.reverse(seqs); -< embeddedSeqs = seqs.iterator(); -< while (embeddedSeqs.hasNext()) { -< TokenSequence tseq = embeddedSeqs.next(); -< if (tseq.language() == JavaTokenId.language()) { -< ts = tseq; -< break; -< } -< } -< } -< -< while (ts != null && ts.offset() < offset) { -< if (!ts.moveNext()) { -< ts = null; -< if (embeddedSeqs == null) { -< List seqs = new ArrayList(embeddedTokenSequences(TokenHierarchy.get(doc), offset)); -< Collections.reverse(seqs); -< embeddedSeqs = seqs.iterator(); -< } -< while (embeddedSeqs.hasNext()) { -< TokenSequence tseq = embeddedSeqs.next(); -< if (tseq.language() == JavaTokenId.language()) { -< ts = tseq; -< break; -< } -< } -< } -< } -< } -< } -< }); -177,178d120 -< doc.render(new Runnable() { -< public void run() { -196c138 -< if (name.equals(info.getTreeUtilities().decodeIdentifier(ts.token().text()).toString())) { ---- -> if (name.equals(ts.token().text().toString())) { -202,203d143 -< } -< }); -207,208d146 -< doc.render(new Runnable() { -< public void run() { -222c160 -< if (t.id() == JavaTokenId.IDENTIFIER && tree.getName().toString().equals(info.getTreeUtilities().decodeIdentifier(t.text()).toString())) { ---- -> if (t.id() == JavaTokenId.IDENTIFIER && tree.getName().toString().equals(t.text().toString())) { -228,229d165 -< } -< }); -233,234d168 -< doc.render(new Runnable() { -< public void run() { -249,250d182 -< offset = info.getSnapshot().getOriginalOffset(offset); -< -260,261d191 -< } -< }); -265,266d194 -< doc.render(new Runnable() { -< public void run() { -279,298d206 -< } -< }); -< } -< -< private static List> embeddedTokenSequences(TokenHierarchy th, int offset) { -< TokenSequence embedded = th.tokenSequence(); -< List> sequences = new ArrayList>(); -< -< do { -< TokenSequence seq = embedded; -< embedded = null; -< -< seq.move(offset); -< if (seq.moveNext()) { -< sequences.add(seq); -< embedded = seq.embedded(); -< } -< } while (embedded != null); -< -< return sequences; diff -r 205b7632914c -r 57843026e60b sandbox/attributed-index-web/API.java --- a/sandbox/attributed-index-web/API.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,572 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.jackpot30.backend.impl.api; - -import java.io.IOException; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicLong; -import javax.lang.model.element.TypeElement; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.StreamingOutput; -import org.codeviation.pojson.Pojson; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.source.ClassIndex.NameKind; -import org.netbeans.api.java.source.ClassIndex.SearchScope; -import org.netbeans.api.java.source.ClasspathInfo; -import org.netbeans.api.java.source.CompilationController; -import org.netbeans.api.java.source.ElementHandle; -import org.netbeans.api.java.source.ModificationResult; -import org.netbeans.modules.jackpot30.backend.impl.CategoryStorage; -import org.netbeans.modules.jackpot30.impl.examples.Example; -import org.netbeans.modules.jackpot30.impl.examples.Example.Option; -import org.netbeans.modules.jackpot30.impl.examples.LoadExamples; -import org.netbeans.modules.jackpot30.impl.indexing.FileBasedIndex; -import org.netbeans.modules.jackpot30.impl.indexing.Index; -import org.netbeans.modules.jackpot30.spi.PatternConvertor; -import org.netbeans.modules.java.hints.jackpot.impl.MessageImpl; -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch; -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.BatchResult; -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.Resource; -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchUtilities; -import org.netbeans.modules.java.hints.jackpot.impl.batch.ProgressHandleWrapper; -import org.netbeans.modules.java.hints.jackpot.impl.batch.Scopes; -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription; -import org.netbeans.modules.java.source.usages.ClassIndexManager; -import org.netbeans.modules.jumpto.type.GoToTypeAction; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.java.classpath.support.ClassPathSupport; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; -import org.openide.util.Exceptions; - -/** - * - * @author lahvac - */ -@Path("/index") -public class API { - - @GET - @Path("/find") - @Produces("text/plain") - //TODO: parameter for "verified"? - public String find(@QueryParam("path") String segment, @QueryParam("pattern") String pattern, @QueryParam("asynchronous") @DefaultValue(value="false") boolean asynchronous) throws IOException { - assert !asynchronous; - - Iterable hints = PatternConvertor.create(pattern); - Set srcRoots = CategoryStorage.getCategoryContent(segment); - final FileObject deepestCommonParent = deepestCommonParent(srcRoots); - BatchResult batchResult = BatchSearch.findOccurrences(hints, Scopes.specifiedFoldersScope(srcRoots.toArray(new FileObject[0]))); - final StringBuilder result = new StringBuilder(); - - BatchSearch.getVerifiedSpans(batchResult, new ProgressHandleWrapper(1), new BatchSearch.VerifiedSpansCallBack() { - @Override public void groupStarted() {} - @Override public boolean spansVerified(CompilationController wc, Resource r, Collection hints) throws Exception { - if (!hints.isEmpty()) { - result.append(FileUtil.getRelativePath(deepestCommonParent, r.getResolvedFile())); - result.append("\n"); - } - return true; - } - @Override public void groupFinished() {} - @Override public void cannotVerifySpan(Resource r) { /*TODO: warn user?*/ } - }, true, new LinkedList()); //TODO: show the messages to the user? - - return result.toString(); - } - - @GET - @Path("/findWithSpans") - @Produces("text/plain") - //TODO: parameter for "verified"? - public String findWithSpans(@QueryParam("path") String segment, @QueryParam("pattern") String pattern, @QueryParam("asynchronous") @DefaultValue(value="false") boolean asynchronous) throws IOException { - assert !asynchronous; - - Iterable hints = PatternConvertor.create(pattern); - Set srcRoots = CategoryStorage.getCategoryContent(segment); - final FileObject deepestCommonParent = deepestCommonParent(srcRoots); - BatchResult batchResult = BatchSearch.findOccurrences(hints, Scopes.specifiedFoldersScope(srcRoots.toArray(new FileObject[0]))); - final Map result = new HashMap(); - - BatchSearch.getVerifiedSpans(batchResult, new ProgressHandleWrapper(1), new BatchSearch.VerifiedSpansCallBack() { - @Override public void groupStarted() {} - @Override public boolean spansVerified(CompilationController wc, Resource r, Collection hints) throws Exception { - if (!hints.isEmpty()) { - int[][] spans = new int[hints.size()][]; - int i = 0; - - for (ErrorDescription ed : hints) { - spans[i++] = new int[] { - ed.getRange().getBegin().getOffset(), - ed.getRange().getEnd().getOffset() - }; - } - - result.put(FileUtil.getRelativePath(deepestCommonParent, r.getResolvedFile()), spans); - } - return true; - } - @Override public void groupFinished() {} - @Override public void cannotVerifySpan(Resource r) { /*TODO: warn user?*/ } - }, true, new LinkedList()); //TODO: show the messages to the user? - - return Pojson.save(result); - } - -// @GET -// @Path("/findCategorize") -// @Produces("text/plain") -// public String findCategorize(@QueryParam("path") final String segment, @QueryParam("pattern") final String pattern, @QueryParam("asynchronous") @DefaultValue(value="false") boolean asynchronous) throws IOException { -// assert asynchronous; -// -// long id = this.id.getAndIncrement(); -// final ProgressImpl progress = new ProgressImpl(); -// -// workInProgress.put(id, progress); -// -// new Thread(new Runnable() { -// public void run() { -// try { -// File sourceRoot = Cache.sourceRootForKey(segment); -// Index idx = FileBasedIndex.get(sourceRoot.toURI().toURL()); -// new SortedQuery().query(idx, pattern, progress); -// } catch (IOException ex) { -// ex.printStackTrace(); -// progress.finish(); -// } -// } -// }).start(); -// -// return Long.toString(id); -// } - - @GET - @Path("/findSpans") - @Produces("text/plain") - public String findSpans(@QueryParam("path") String segment, @QueryParam("relativePath") String relativePath, @QueryParam("pattern") String pattern) throws IOException { - Iterable hints = PatternConvertor.create(pattern); - Set srcRoots = CategoryStorage.getCategoryContent(segment); - FileObject deepestCommonParent = deepestCommonParent(srcRoots); - BatchResult batchResult = BatchSearch.findOccurrences(hints, Scopes.specifiedFoldersScope(deepestCommonParent.getFileObject(relativePath))); - final StringBuilder result = new StringBuilder(); - - BatchSearch.getVerifiedSpans(batchResult, new ProgressHandleWrapper(1), new BatchSearch.VerifiedSpansCallBack() { - @Override public void groupStarted() {} - @Override public boolean spansVerified(CompilationController wc, Resource r, Collection hints) throws Exception { - for (ErrorDescription ed : hints) { - result.append(ed.getRange().getBegin().getOffset()); - result.append(":"); - result.append(ed.getRange().getEnd().getOffset()); - result.append(":"); - } - return true; - } - @Override public void groupFinished() {} - @Override public void cannotVerifySpan(Resource r) { /*TODO: warn user?*/ } - }, true, new LinkedList()); //TODO: show the messages to the user? - - if (result.length() > 0) { - result.delete(result.length() - 1, result.length()); - } - return result.toString(); - } - - @GET - @Path("/list") - @Produces("text/plain") - public String list() throws IOException { - StringBuilder sb = new StringBuilder(); - - for (Entry e : CategoryStorage.listCategoriesWithNames().entrySet()) { - sb.append(e.getKey()); - sb.append(":"); - sb.append(e.getValue()); - sb.append("\n"); - } - - return sb.toString(); - } - - @GET - @Path("/cat") - @Produces("text/plain") - public String cat(@QueryParam("path") String segment, @QueryParam("relative") String relative) throws IOException { - Set srcRoots = CategoryStorage.getCategoryContent(segment); - FileObject deepestCommonParent = deepestCommonParent(srcRoots); - FileObject file = deepestCommonParent.getFileObject(relative); - ClassPath cp = ClassPathSupport.createClassPath(srcRoots.toArray(new FileObject[0])); - FileObject root = cp.findOwnerRoot(file); - String path = cp.getResourceName(file); - Index index = FileBasedIndex.get(root.getURL()); - - if (index == null) { - throw new IOException("No index"); - } - - CharSequence source = index.getSourceCode(path); - - if (source == null) { - throw new IOException("Source code not found"); - } - - return source.toString().replaceAll("\r\n", "\n"); - } - - @GET - @Path("/apply") - @Produces("text/diff") - //TODO: parameter for "verified"? - public StreamingOutput apply(@QueryParam("path") String segment, @QueryParam("pattern") String pattern, @QueryParam("asynchronous") @DefaultValue(value="false") boolean asynchronous) throws IOException { - assert !asynchronous; - - Iterable hints = PatternConvertor.create(pattern); - Set srcRoots = CategoryStorage.getCategoryContent(segment); - final FileObject deepestCommonParent = deepestCommonParent(srcRoots); - BatchResult batchResult = BatchSearch.findOccurrences(hints, Scopes.specifiedFoldersScope(srcRoots.toArray(new FileObject[0]))); - final Collection modifications = BatchUtilities.applyFixes(batchResult, new ProgressHandleWrapper(1), new AtomicBoolean(), new LinkedList()); - - return new StreamingOutput() { - @Override public void write(OutputStream output) throws IOException, WebApplicationException { - Writer w = new OutputStreamWriter(output, "UTF-8"); - - try { - for (ModificationResult modResult : modifications) { - org.netbeans.modules.jackpot30.impl.batch.BatchUtilities.exportDiff(modResult, deepestCommonParent, w); - } - } finally { - try { - w.close(); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - } - } - }; - } - -// @GET -// @Path("/info") -// @Produces("text/plain") -// public String info(@QueryParam("path") String segment) throws IOException { -// URL sourceRoot = Cache.sourceRootForKey(segment).toURI().toURL(); -// Index index = FileBasedIndex.get(sourceRoot); -// -// if (index == null) { -// throw new IOException("No index"); -// } -// -// return Pojson.save(index.getIndexInfo()); -// } - - @GET - @Path("/examples") - @Produces("text/plain") - public String examples() throws IOException { - List> examples = new LinkedList>(); - - for (Example ex : LoadExamples.loadExamples()) { - if (ex.getOptions().contains(Option.VERIFY) || ex.getOptions().contains(Option.FIX)) continue; - Map desc = new HashMap(); - - desc.put("displayName", ex.getDisplayName()); - desc.put("pattern", ex.getCode()); - - examples.add(desc); - } - - return Pojson.save(examples); - } - - @GET - @Path("/errors") - @Produces("text/plain") - public String errors(@QueryParam("pattern") String pattern) throws IOException { - StringBuilder sb = new StringBuilder(); - - for (Diagnostic d : StandaloneFinder.parseAndReportErrors(pattern)) { - sb.append(d.getMessage(null)); - sb.append("\n"); - } - - return sb.toString(); - } - - @GET - @Path("/findDuplicates") - @Produces("text/plain") - public String findDuplicates(@QueryParam("path") String segment, @QueryParam("hashes") String hashes) throws IOException { - Map>> hash2Segment2Contains = new HashMap>>(); - Collection segments = new LinkedList(); - - if (segment != null) segments.add(segment); - else { - segments.addAll(CategoryStorage.listCategoriesWithNames().keySet()); - } - - Iterable hashesList = Arrays.asList(Pojson.load(String[].class, hashes)); - - for (String seg : segments) { - Set srcRoots = CategoryStorage.getCategoryContent(seg); - final FileObject deepestCommonParent = deepestCommonParent(srcRoots); - - for (FileObject root : srcRoots) { - Map> found = StandaloneFinder.containsHash(FileUtil.toFile(root), hashesList); - - for (Entry> e : found.entrySet()) { - Map> perRoot = hash2Segment2Contains.get(e.getKey()); - - if (perRoot == null) { - hash2Segment2Contains.put(e.getKey(), perRoot = new HashMap>()); - } - - Collection rel = perRoot.get(seg); - - if (rel == null) { - perRoot.put(seg, rel = new ArrayList(e.getValue().size())); - } - - for (String r : e.getValue()) { - rel.add(FileUtil.getRelativePath(deepestCommonParent, root.getFileObject(r))); - } - } - } - } - - return Pojson.save(hash2Segment2Contains); - } - - @GET - @Path("/checkProgress") - @Produces("text/plain") - public String checkProgress(@QueryParam("id") long id) throws IOException { - ProgressImpl progress = workInProgress.get(id); - Map result; - - if (progress == null) { - result = new HashMap(); - result.put("total", 0); - result.put("workDone", 0); - result.put("finished", true); - result.put("result", Collections.emptyList()); - } else { - result = progress.progressPacket(); - } - - if (result.get("finished") == Boolean.TRUE) { - workInProgress.remove(id); - } - - return Pojson.save(result); - } - - @GET - @Path("/cancelProgress") - @Produces("text/plain") - public String cancelProgress(@QueryParam("id") long id) throws IOException { - ProgressImpl progress = workInProgress.get(id); - - if (progress != null) { - progress.cancel.set(true); - } - - return "done"; - } - - @GET - @Path("/capabilities") - @Produces("text/plain") - public String capabilities() throws IOException { - Map result = new HashMap(); - List methods = new ArrayList(API.class.getDeclaredMethods().length); - - for (Method m : API.class.getDeclaredMethods()) { - if (m.isAnnotationPresent(GET.class) && (m.getModifiers() & Modifier.PUBLIC) != 0) { - methods.add(m.getName()); - } - } - - result.put("methods", methods); - result.put("attributed", true); - - return Pojson.save(result); - } - - @GET - @Path("/findType") - @Produces("text/plain") - public String findType(@QueryParam("path") String segment, @QueryParam("prefix") String prefix, @QueryParam("casesensitive") @DefaultValue("false") boolean casesensitive, @QueryParam("asynchronous") @DefaultValue(value="false") boolean asynchronous) throws IOException { - assert !asynchronous; - - //copied (and converted to NameKind) from jumpto's GoToTypeAction: - boolean exact = prefix.endsWith(" "); // NOI18N - - prefix = prefix.trim(); - - if ( prefix.length() == 0) { - return ""; - } - - NameKind nameKind; - int wildcard = GoToTypeAction.containsWildCard(prefix); - - if (exact) { - //nameKind = panel.isCaseSensitive() ? SearchType.EXACT_NAME : SearchType.CASE_INSENSITIVE_EXACT_NAME; - nameKind = NameKind.SIMPLE_NAME; - } - else if ((GoToTypeAction.isAllUpper(prefix) && prefix.length() > 1) || GoToTypeAction.isCamelCase(prefix)) { - nameKind = NameKind.CAMEL_CASE; - } - else if (wildcard != -1) { - nameKind = casesensitive ? NameKind.REGEXP : NameKind.CASE_INSENSITIVE_REGEXP; - } - else { - nameKind = casesensitive ? NameKind.PREFIX : NameKind.CASE_INSENSITIVE_PREFIX; - } - - Map> result = new LinkedHashMap>(); - Set srcRoots = CategoryStorage.getCategoryContent(segment); - FileObject deepestCommonParent = deepestCommonParent(srcRoots); - - for (FileObject srcRoot : srcRoots) { - String rootId = FileUtil.getRelativePath(deepestCommonParent, srcRoot); - List currentResult = new ArrayList(); - - result.put(rootId, currentResult); - - ClassIndexManager.getDefault().createUsagesQuery(srcRoot.getURL(), true); - ClasspathInfo cpInfo = ClasspathInfo.create(ClassPath.EMPTY, ClassPath.EMPTY, ClassPathSupport.createClassPath(srcRoot)); - Set> names = new HashSet>(cpInfo.getClassIndex().getDeclaredTypes(prefix, nameKind, EnumSet.of(SearchScope.SOURCE))); - - if (nameKind == NameKind.CAMEL_CASE) { - names.addAll(cpInfo.getClassIndex().getDeclaredTypes(prefix, NameKind.CASE_INSENSITIVE_PREFIX, EnumSet.of(SearchScope.SOURCE))); - } - - for (ElementHandle d : names) { - currentResult.add(d.getBinaryName()); - } - } - - return Pojson.save(result); - } - - //XXX: not really correct, a base directory(-ies?) should be set in the category! - private static FileObject deepestCommonParent(Set roots) { - FileObject result = null; - - for (FileObject r : roots) { - if (result == null) { - result = r; - } else { - while (!FileUtil.isParentOf(result, r)) { - result = result.getParent(); - } - } - } - - return result; - } - - private final static AtomicLong id = new AtomicLong(); - private final static Map workInProgress = new HashMap();//XXX: should be cleared eventually even if not read - - private static final class ProgressImpl implements Progress { - private int total = -1; - private int workDone = 0; - private boolean finished; - private final List result = new ArrayList(); - private final AtomicBoolean cancel = new AtomicBoolean(); - public synchronized void setTotalWork(int total) { - this.total = total; - } - public synchronized void progress(int totalDone) { - workDone = totalDone; - } - public synchronized void updateProgress(int updateDone) { - workDone += updateDone; - } - public synchronized void addResultPart(String part) { - result.add(part); - } - public synchronized void finish() { - finished = true; - } - public synchronized boolean isCancelled() { - return cancel.get(); - } - synchronized Map progressPacket() { - Map result = new HashMap(); - - result.put("total", total); - result.put("workDone", workDone); - result.put("finished", finished); - result.put("result", new ArrayList(this.result)); - - this.result.clear(); - - return result; - } - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/attributed-index-web/Progress.java --- a/sandbox/attributed-index-web/Progress.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2011 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.jackpot30.backend.impl.api; - -/** - * - * @author lahvac - */ -public interface Progress { - - public void setTotalWork(int total); - public void progress(int totalDone); - public void updateProgress(int updateDone); - public void addResultPart(String part); - public void finish(); - - public boolean isCancelled(); - - -} diff -r 205b7632914c -r 57843026e60b sandbox/attributed-index-web/StandaloneFinder.java --- a/sandbox/attributed-index-web/StandaloneFinder.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,213 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.jackpot30.backend.impl.api; - -import com.sun.source.tree.CompilationUnitTree; -import com.sun.source.tree.Tree; -import com.sun.source.util.TreePath; -import com.sun.source.util.Trees; -import com.sun.tools.javac.api.JavacTaskImpl; -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.net.URL; -import java.util.Arrays; -import java.util.BitSet; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; -import javax.tools.Diagnostic; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; -import org.apache.lucene.document.Document; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.Term; -import org.apache.lucene.search.Collector; -import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.Searcher; -import org.apache.lucene.search.TermQuery; -import org.apache.lucene.store.FSDirectory; -import org.netbeans.modules.jackpot30.impl.duplicates.indexing.DuplicatesIndex; -import org.netbeans.modules.jackpot30.impl.indexing.AbstractLuceneIndex.BitSetCollector; -import org.netbeans.modules.jackpot30.impl.indexing.FileBasedIndex; -import org.netbeans.modules.jackpot30.spi.PatternConvertor; -import org.netbeans.modules.java.hints.jackpot.impl.Utilities; -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch; -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch.BulkPattern; -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription; -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription.AdditionalQueryConstraints; -import org.netbeans.modules.java.hints.jackpot.spi.Trigger.PatternDescription; -import org.netbeans.modules.parsing.impl.indexing.CacheFolder; -import org.netbeans.modules.parsing.impl.indexing.SPIAccessor; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; - -/** - * - * @author lahvac - */ -public class StandaloneFinder { - - public static Collection findCandidates(File sourceRoot, String pattern) throws IOException { - BulkPattern bulkPattern = preparePattern(pattern, null); - - return FileBasedIndex.get(sourceRoot.toURI().toURL()).findCandidates(bulkPattern); - } - - public static int[] findCandidateOccurrenceSpans(File sourceRoot, String relativePath, String pattern) throws IOException { - BulkPattern bulkPattern = preparePattern(pattern, null); - CharSequence source = FileBasedIndex.get(sourceRoot.toURI().toURL()).getSourceCode(relativePath).toString().replaceAll("\r\n", "\n"); - JavacTaskImpl jti = prepareJavacTaskImpl(); - CompilationUnitTree cut = jti.parse(new JFOImpl(source)).iterator().next(); - Collection paths = new LinkedList(); - - for (Collection c : BulkSearch.getDefault().match(null, new TreePath(cut), bulkPattern).values()) { - paths.addAll(c); - } - - Trees t = Trees.instance(jti); - int[] result = new int[2 * paths.size()]; - int i = 0; - - for (TreePath tp : paths) { - result[i++] = (int) t.getSourcePositions().getStartPosition(cut, tp.getLeaf()); - result[i++] = (int) t.getSourcePositions().getEndPosition(cut, tp.getLeaf()); - } - - return result; - } - - public static Collection> parseAndReportErrors(String pattern) { - Collection> errors = new LinkedList>(); - - preparePattern(pattern, errors); - - return errors; - } - - private static File getIndex(URL url) throws IOException { - FileObject indexBaseFolder = CacheFolder.getDataFolder(url); - String path = SPIAccessor.getInstance().getIndexerPath(DuplicatesIndex.NAME, DuplicatesIndex.VERSION); - FileObject indexFolder = FileUtil.createFolder(indexBaseFolder, path); - return FileUtil.toFile(indexFolder); - } - - public static Map> containsHash(File sourceRoot, Iterable hashes) throws IOException { - File cacheRoot = getIndex(sourceRoot.toURI().toURL()); - File dir = new File(cacheRoot, "fulltext"); - - if (dir.listFiles() != null && dir.listFiles().length > 0) { - IndexReader reader = IndexReader.open(FSDirectory.open(dir), true); - Map> result = new HashMap>(); - - for (String hash : hashes) { - Collection found = new LinkedList(); - Query query = new TermQuery(new Term("generalized", hash)); - Searcher s = new IndexSearcher(reader); - BitSet matchingDocuments = new BitSet(reader.maxDoc()); - Collector c = new BitSetCollector(matchingDocuments); - - s.search(query, c); - - for (int docNum = matchingDocuments.nextSetBit(0); docNum >= 0; docNum = matchingDocuments.nextSetBit(docNum + 1)) { - final Document doc = reader.document(docNum); - - found.add(doc.getField("path").stringValue()); - } - - result.put(hash, found); - } - - return result; - } - - return Collections.emptyMap(); - } - - private static BulkPattern preparePattern(String pattern, Collection> errors) { - return preparePattern(PatternConvertor.create(pattern), errors); - } - - //XXX: copied from BatchSearch, may be possible to merge once CompilationInfo is accessible in server mode - private static BulkPattern preparePattern(final Iterable patterns, Collection> errors) { - JavacTaskImpl javac = prepareJavacTaskImpl(); - Collection code = new LinkedList(); - Collection trees = new LinkedList(); - Collection additionalConstraints = new LinkedList(); - - for (HintDescription pattern : patterns) { - String textPattern = ((PatternDescription) pattern.getTrigger()).getPattern(); - - code.add(textPattern); - trees.add(Utilities.parseAndAttribute(javac, textPattern, errors)); - additionalConstraints.add(pattern.getAdditionalConstraints()); - } - - return BulkSearch.getDefault().create(code, trees, additionalConstraints); - } - - private static JavacTaskImpl prepareJavacTaskImpl() { - final String bootPath = System.getProperty("sun.boot.class.path"); //NOI18N - final JavaCompiler tool = ToolProvider.getSystemJavaCompiler(); - - assert tool != null; - - JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, null, null, Arrays.asList("-bootclasspath", bootPath, "-Xjcov"), null, Collections.emptyList()); - - return ct; - } - - private static final class JFOImpl extends SimpleJavaFileObject { - private final CharSequence code; - public JFOImpl(CharSequence code) { - super(URI.create(""), Kind.SOURCE); - this.code = code; - } - @Override - public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { - return code; - } - } -} diff -r 205b7632914c -r 57843026e60b sandbox/attributed-index-web/UI.java --- a/sandbox/attributed-index-web/UI.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,423 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.jackpot30.backend.impl.ui; - -import java.util.Comparator; -import javax.ws.rs.core.Response; -import java.util.LinkedHashMap; -import java.util.Map.Entry; -import freemarker.cache.TemplateLoader; -import freemarker.template.Configuration; -import freemarker.template.Template; -import freemarker.template.TemplateException; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringWriter; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import org.codeviation.pojson.Pojson; -import org.netbeans.modules.jackpot30.impl.WebUtilities; -import static org.netbeans.modules.jackpot30.impl.WebUtilities.escapeForQuery; - -/** - * - * @author lahvac - */ -@Path("/index/ui") -public class UI { - - @GET - @Path("/search") - @Produces("text/html") - public String search(@QueryParam("path") String path, @QueryParam("pattern") String pattern) throws URISyntaxException, IOException, TemplateException { - Map configurationData = new HashMap(); - - configurationData.put("paths", list()); - configurationData.put("selectedPath", path); - configurationData.put("pattern", pattern); - configurationData.put("patternEscaped", escapeForQuery(pattern)); - configurationData.put("examples", loadExamples()); - - if (pattern != null && path != null) { - URI u = new URI("http://localhost:9998/index/find?path=" + escapeForQuery(path) + "&pattern=" + escapeForQuery(pattern)); - List> results = new LinkedList>(); - long queryTime = System.currentTimeMillis(); - List candidates = new ArrayList(WebUtilities.requestStringArrayResponse(u)); - - queryTime = System.currentTimeMillis() - queryTime; - - Collections.sort(candidates); - - for (String c : candidates) { - Map found = new HashMap(3); - - found.put("relativePath", c); - - results.add(found); - } - - configurationData.put("results", results); - - Map statistics = new HashMap(); - - statistics.put("files", candidates.size()); - statistics.put("queryTime", queryTime); - - configurationData.put("statistics", statistics); - } - - return processTemplate("ui-search.html", configurationData); - } - -// @GET -// @Path("/searchCategorized") -// @Produces("text/html") -// public String searchCategorized(@QueryParam("path") String path, @QueryParam("pattern") String pattern) throws URISyntaxException, IOException, TemplateException { -// Map configurationData = new HashMap(); -// -// configurationData.put("paths", list()); -// configurationData.put("selectedPath", path); -// configurationData.put("pattern", pattern); -// configurationData.put("patternEscaped", escapeForQuery(pattern)); -// configurationData.put("examples", loadExamples()); -// -// if (pattern != null && path != null) { -// Result queryResult = new DoQuery().doQuery(path, pattern, new Cancel() { -// public boolean isCancelled() { -// return false; -// } -// }); -// -// configurationData.put("result", queryResult.result); -// } -// -// return processTemplate("ui-search-categorized.html", configurationData); -// } - - @GET - @Path("/show") - @Produces("text/html") - public String show(@QueryParam("path") String path, @QueryParam("relative") String relativePath, @QueryParam("pattern") String pattern) throws URISyntaxException, IOException, TemplateException { - Map configurationData = new HashMap(); - List> occurrences = new LinkedList>(); - - configurationData.put("occurrences", occurrences); - - URI codeURL = new URI("http://localhost:9998/index/cat?path=" + escapeForQuery(path) + "&relative=" + escapeForQuery(relativePath)); - String code = WebUtilities.requestStringResponse(codeURL); - - if (pattern != null) { - URI spansURL = new URI("http://localhost:9998/index/findSpans?path=" + escapeForQuery(path) + "&relativePath=" + escapeForQuery(relativePath) + "&pattern=" + escapeForQuery(pattern)); - int currentCodePos = 0; - for (int[] span : parseSpans(WebUtilities.requestStringResponse(spansURL))) { //XXX: sorted! - Map occ = new HashMap(); - occ.put("prefix", WebUtilities.escapeForHTMLElement(code.substring(currentCodePos, span[0]))); - occ.put("occurrence", WebUtilities.escapeForHTMLElement(code.substring(span[0], span[1]))); - occurrences.add(occ); - currentCodePos = span[1]; - } - - configurationData.put("suffix", WebUtilities.escapeForHTMLElement(code.substring(currentCodePos, code.length()))); - } else { - configurationData.put("suffix", WebUtilities.escapeForHTMLElement(code)); - } - - return processTemplate("ui-cat.html", configurationData); - } - - @GET - @Path("/snippet") - @Produces("text/html") - public String snippet(@QueryParam("path") String path, @QueryParam("relative") String relativePath, @QueryParam("pattern") String pattern) throws URISyntaxException, IOException, TemplateException { - List> snippets = new LinkedList>(); - - URI codeURL = new URI("http://localhost:9998/index/cat?path=" + escapeForQuery(path) + "&relative=" + escapeForQuery(relativePath)); - String code = WebUtilities.requestStringResponse(codeURL); - URI spansURL = new URI("http://localhost:9998/index/findSpans?path=" + escapeForQuery(path) + "&relativePath=" + escapeForQuery(relativePath) + "&pattern=" + escapeForQuery(pattern)); - - for (int[] span : parseSpans(WebUtilities.requestStringResponse(spansURL))) { - snippets.add(prepareSnippet(code, span)); - } - - return processTemplate("ui-snippet.html", Collections.singletonMap("snippets", snippets)); - } - - @GET - @Path("/apply") - @Produces("text/html") - public Response apply(@QueryParam("path") String path, @QueryParam("pattern") String pattern, @QueryParam("preview") @DefaultValue("") String preview, @QueryParam("download") @DefaultValue("") String download) throws URISyntaxException, IOException, TemplateException { - if (!download.isEmpty()) { - if (pattern != null && path != null) { - URI u = new URI("http://localhost:9998/index/apply?path=" + escapeForQuery(path) + "&pattern=" + escapeForQuery(pattern)); - - return Response.temporaryRedirect(u).header("meta", "Content-Disposition: download; filename=\"patch.diff\"").build(); - } - } - - Map configurationData = new HashMap(); - - configurationData.put("paths", list()); - configurationData.put("selectedPath", path); - configurationData.put("pattern", pattern); - configurationData.put("patternEscaped", escapeForQuery(pattern)); - configurationData.put("examples", loadExamples()); - - if (pattern != null && path != null) { - URI u = new URI("http://localhost:9998/index/apply?path=" + escapeForQuery(path) + "&pattern=" + escapeForQuery(pattern)); - long queryTime = System.currentTimeMillis(); - String diff = WebUtilities.requestStringResponse(u); - - queryTime = System.currentTimeMillis() - queryTime; - - configurationData.put("diff", diff); - - StringBuilder sb = new StringBuilder(); - - for (String l : diff.split("\n")) { - sb.append(" e : prefix2SpanName.entrySet()) { - if (l.startsWith(e.getKey())) { - sb.append(" class='" + e.getValue() + "'"); - break; - } - } - - sb.append(">"); - sb.append(l); - sb.append("\n"); - } - - configurationData.put("result", sb.toString()); - } - - return Response.ok(processTemplate("ui-apply.html", configurationData), "text/html").build(); - } - - @GET - @Path("/searchType") - @Produces("text/html") - public String searchType(@QueryParam("path") String path, @QueryParam("prefix") String prefix) throws URISyntaxException, IOException, TemplateException { - Map configurationData = new HashMap(); - - configurationData.put("paths", list()); - configurationData.put("selectedPath", path); - configurationData.put("prefix", prefix); - - if (prefix != null && path != null) { - URI u = new URI("http://localhost:9998/index/findType?path=" + escapeForQuery(path) + "&prefix=" + escapeForQuery(prefix)); - long queryTime = System.currentTimeMillis(); - @SuppressWarnings("unchecked") //XXX: should not trust something got from the network! - Map> types = Pojson.load(LinkedHashMap.class, u); - List> results = new LinkedList>(); - - queryTime = System.currentTimeMillis() - queryTime; - - for (Entry> e : types.entrySet()) { - for (String fqn : e.getValue()) { - Map found = new HashMap(3); - - found.put("fqn", fqn); - - if (fqn.contains("$")) { - fqn = fqn.substring(0, fqn.indexOf("$")); - } - - found.put("relativePath", e.getKey() + "/" + fqn.replace('.', '/') + ".java"); - - results.add(found); - } - } - - Collections.sort(results, new Comparator>() { - @Override public int compare(Map o1, Map o2) { - return ((String) o1.get("fqn")).compareTo((String) o2.get("fqn")); - } - }); - - configurationData.put("results", results); - - Map statistics = new HashMap(); - - statistics.put("queryTime", queryTime); - - configurationData.put("statistics", statistics); - } - - return processTemplate("ui-findType.html", configurationData); - } - - private static final Map prefix2SpanName = new LinkedHashMap(); - - static { - prefix2SpanName.put("-", "diff-removed"); - prefix2SpanName.put("+", "diff-added"); - prefix2SpanName.put("@@", "diff-hunk"); - prefix2SpanName.put("Index:", "diff-index"); - } - - private static List> list() throws URISyntaxException { - List> result = new LinkedList>(); - - for (String enc : WebUtilities.requestStringArrayResponse(new URI("http://localhost:9998/index/list"))) { - Map rootDesc = new HashMap(); - String[] col = enc.split(":", 2); - - rootDesc.put("segment", col[0]); - rootDesc.put("displayName", col[1]); - result.add(rootDesc); - } - - return result; - } - - private static Iterable parseSpans(String from) { - if (from.isEmpty()) { - return Collections.emptyList(); - } - String[] split = from.split(":"); - List result = new LinkedList(); - - for (int i = 0; i < split.length; i += 2) { - result.add(new int[] { - Integer.parseInt(split[i + 0].trim()), - Integer.parseInt(split[i + 1].trim()) - }); - } - - return result; - } - - private static final int DESIRED_CONTEXT = 2; - - private static Map prepareSnippet(String code, int[] span) { - int grandStart = span[0]; - int firstLineStart = grandStart = lineStart(code, grandStart); - - while (grandStart > 0 && contextLength(code.substring(grandStart, firstLineStart)) < DESIRED_CONTEXT) - grandStart = lineStart(code, grandStart - 1); - - int grandEnd = span[1]; - int firstLineEnd = grandEnd = lineEnd(code, grandEnd); - - while (grandEnd < code.length() - 1 && contextLength(code.substring(firstLineEnd, grandEnd)) < DESIRED_CONTEXT) - grandEnd = lineEnd(code, grandEnd + 1); - - Map result = new HashMap(); - - result.put("prefix", WebUtilities.escapeForHTMLElement(code.substring(grandStart, span[0]))); - result.put("occurrence", WebUtilities.escapeForHTMLElement(code.substring(span[0], span[1]))); - result.put("suffix", WebUtilities.escapeForHTMLElement(code.substring(span[1], grandEnd))); - - return result; - } - - private static int lineStart(String code, int o) { - while (o > 0 && code.charAt(o) != '\n') { - o--; - } - - return o; - } - - private static int lineEnd(String code, int o) { - while (o < code.length() - 1 && code.charAt(o) != '\n') { - o++; - } - - return o; - } - - private static int contextLength(String in) { - return in.replaceAll("\n[ \t]*\n", "\n").trim().split("\n").length; - } - - @SuppressWarnings("unchecked") - private List> loadExamples() throws IOException, URISyntaxException { - return Pojson.load(LinkedList.class, new URI("http://localhost:9998/index/examples")); - } - - private static String processTemplate(String template, Map configurationData) throws TemplateException, IOException { - Configuration conf = new Configuration(); - - conf.setTemplateLoader(new TemplateLoaderImpl()); - - Template templ = conf.getTemplate(template); - StringWriter out = new StringWriter(); - - templ.process(configurationData, out); - - return out.toString(); - } - - private static final class TemplateLoaderImpl implements TemplateLoader { - - public Object findTemplateSource(String name) throws IOException { - return TemplateLoaderImpl.class.getResourceAsStream(name); - } - - public long getLastModified(Object templateSource) { - return 0L; - } - - public Reader getReader(Object templateSource, String encoding) throws IOException { - InputStream in = (InputStream) templateSource; - - return new InputStreamReader(in); - } - - public void closeTemplateSource(Object templateSource) throws IOException { - } - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/attributed-index-web/ui-apply.html --- a/sandbox/attributed-index-web/ui-apply.html Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ - - - -<#if results??> - - - - - - - - - -
-
-
- - - -
-<#if examples??> - Examples: -
- <#list examples as example> -
${example.displayName}
- 
${example.pattern}
-
- -
- -
- -<#if result??> - Diff for rule: ${pattern} -
${result}
- - -<#if statistics??> - Query time: ${statistics.queryTime}ms, matching files: ${statistics.files}. - - - diff -r 205b7632914c -r 57843026e60b sandbox/attributed-index-web/ui-cat.html --- a/sandbox/attributed-index-web/ui-cat.html Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - -
<#list occurrences as occurrence>${occurrence.prefix}${occurrence.occurrence}${suffix}
- - diff -r 205b7632914c -r 57843026e60b sandbox/attributed-index-web/ui-findType.html --- a/sandbox/attributed-index-web/ui-findType.html Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ - - - - - -
- - -
-value="${prefix}"/>
- -
- -<#if results??> - Found types:
- <#list results as result> - ${result.fqn}
- - - - - diff -r 205b7632914c -r 57843026e60b sandbox/attributed-index-web/ui-search.html --- a/sandbox/attributed-index-web/ui-search.html Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ - - - -<#if results??> - - - - - -
- - - -
-
-
- -
- -
-<#if examples??> - Examples: -
- <#list examples as example> -
${example.displayName}
- 
${example.pattern}
-
- -
- -
- -<#if results??> - Found candidates for pattern: ${pattern} -
- <#list results as result> -
${result.relativePath}show
-
-
- -
- - -<#if statistics??> - Query time: ${statistics.queryTime}ms, matching files: ${statistics.files}. - - - diff -r 205b7632914c -r 57843026e60b sandbox/attributed-index-web/ui-snippet.html --- a/sandbox/attributed-index-web/ui-snippet.html Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -<#if snippets??> - <#list snippets as snippet> - 
${snippet.prefix}${snippet.occurrence}${snippet.suffix}

- -<#else> - No occurrences. - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/build.sh --- a/sandbox/java.hints/build.sh Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -#!/bin/bash -ant "$@" clean && ant "$@" nbms && ant "$@" test || exit 1 - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/build.xml --- a/sandbox/java.hints/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - - - - - Builds the module suite java.hints. - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/build.xml --- a/sandbox/java.hints/hintsimpl/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project org.netbeans.modules.jackpot30.hintsimpl. - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/manifest.mf --- a/sandbox/java.hints/hintsimpl/manifest.mf Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -Manifest-Version: 1.0 -OpenIDE-Module: org.netbeans.modules.jackpot30.hintsimpl -OpenIDE-Module-Implementation-Version: 1 -OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jackpot30/hintsimpl/Bundle.properties - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/nbproject/build-impl.xml --- a/sandbox/java.hints/hintsimpl/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ - - - - - - - - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/nbproject/genfiles.properties --- a/sandbox/java.hints/hintsimpl/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -build.xml.data.CRC32=52580c5f -build.xml.script.CRC32=ef577a91 -build.xml.stylesheet.CRC32=a56c6a5b@2.70 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=52580c5f -nbproject/build-impl.xml.script.CRC32=9204f652 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70 diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/nbproject/project.properties --- a/sandbox/java.hints/hintsimpl/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial -requires.nb.javac=true -spec.version.base=1.0 -test.runner=junit diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/nbproject/project.xml --- a/sandbox/java.hints/hintsimpl/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,232 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - org.netbeans.modules.jackpot30.hintsimpl - - - - org.netbeans.api.annotations.common - - - - 1 - 1.20 - - - - org.netbeans.api.java.classpath - - - - 1 - 1.39 - - - - org.netbeans.libs.javacapi - - - - 8.4.0.3 - - - - org.netbeans.modules.java.hints - - - - 1 - - - - - org.netbeans.modules.java.source - - - - 0.124.0.24.1.23.6 - - - - org.netbeans.modules.java.source.base - - - - 2.4.1.2.25.8.1 - - - - org.netbeans.modules.java.sourceui - - - - 1 - 1.33.0.1.25 - - - - org.netbeans.modules.queries - - - - 1 - 1.36 - - - - org.netbeans.modules.refactoring.api - - - - 1.37.0.1 - - - - org.netbeans.modules.refactoring.java - - - - 1 - - - - - org.netbeans.spi.editor.hints - - - - 0 - 1.31.0.7.42 - - - - org.netbeans.spi.java.hints - - - - 2.0 - - - - org.openide.awt - - - - 7.59 - - - - org.openide.filesystems - - - - 8.8 - - - - org.openide.loaders - - - - 7.50 - - - - org.openide.nodes - - - - 7.36 - - - - org.openide.text - - - - 6.57 - - - - org.openide.util - - - - 8.32 - - - - org.openide.util.lookup - - - - 8.22 - - - - org.openide.util.ui - - - - 9.3 - - - - org.openide.windows - - - - 6.64 - - - - - - unit - - org.netbeans.libs.junit4 - - - - org.netbeans.libs.testng - - - - org.netbeans.modules.editor.mimelookup.impl - - - - org.netbeans.modules.jackpot30.test.borrowed - - - - org.netbeans.modules.java.editor - - - - - org.netbeans.modules.java.hints.test - - - - - org.netbeans.modules.parsing.nb - - - - org.netbeans.modules.projectapi.nb - - - - org.netbeans.spi.java.hints - - - - - - - - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/nbproject/suite.properties --- a/sandbox/java.hints/hintsimpl/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/Bundle.properties --- a/sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -OpenIDE-Module-Name=Jackpot 3.0 Experimental Hints Impl diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/GlobalyUnused.java --- a/sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/GlobalyUnused.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,120 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.modules.jackpot30.hintsimpl; - -import com.sun.source.tree.Tree.Kind; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.type.TypeKind; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.java.hints.Decision; -import org.netbeans.spi.java.hints.Decision.Factory; -import org.netbeans.spi.java.hints.ErrorDescriptionFactory; -import org.netbeans.spi.java.hints.Hint; -import org.netbeans.spi.java.hints.HintContext; -import org.netbeans.spi.java.hints.TriggerDecision; -import org.netbeans.spi.java.hints.TriggerTreeKind; - -/** - * - * @author lahvac - */ -@Hint(displayName="Unused", description="Unused", category="general") -public class GlobalyUnused { - - @TriggerTreeKind({Kind.IDENTIFIER, Kind.MEMBER_SELECT}) - public static ErrorDescription usage(HintContext ctx) { - DecisionImpl d = decisionOrNull(ctx); - - if (d != null) { - System.err.println("recording usage"); - d.recordLocalFact(ctx.getInfo(), null); - } - - return null; - } - - @TriggerTreeKind({Kind.CLASS}) - public static ErrorDescription declaration(HintContext ctx) { - decisionOrNull(ctx); - return null; - } - - @TriggerDecision(DecisionImpl.class) - public static ErrorDescription produceWarning(HintContext ctx) { - if (((DecisionImpl) ctx.decision).getCurrentResult() != Boolean.TRUE) { - return ErrorDescriptionFactory.forName(ctx, ctx.getPath(), "Unused"); - } - - return null; - } - - private static DecisionImpl decisionOrNull(HintContext ctx) { - Element el = ctx.getInfo().getTrees().getElement(ctx.getPath()); - - if (el == null || (el.asType() != null && el.asType().getKind() == TypeKind.ERROR) || el.getKind() != ElementKind.CLASS) return null; - - TreePathHandle h = TreePathHandle.create(el, ctx.getInfo()); - - System.err.println("decision for: " + el); - return ctx.findDecision(h, new Factory(DecisionImpl.class) { - @Override - public DecisionImpl create(TreePathHandle handle) { - return new DecisionImpl(handle); - } - }); - } - - private static final class DecisionImpl extends Decision { - - public DecisionImpl(TreePathHandle root) { - super(root); - } - - @Override - protected Boolean makeDecision(Iterable input) { - return input.iterator().hasNext(); - } - - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/NonPrivateMakeFinal.java --- a/sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/NonPrivateMakeFinal.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,152 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.modules.jackpot30.hintsimpl; - -import com.sun.source.tree.Tree.Kind; -import com.sun.source.tree.VariableTree; -import com.sun.source.util.TreePath; -import java.util.EnumSet; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.VariableElement; -import org.netbeans.api.annotations.common.NonNull; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.modules.java.hints.introduce.Flow; -import org.netbeans.modules.java.hints.introduce.Flow.FlowResult; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.editor.hints.Fix; -import org.netbeans.spi.java.hints.Decision; -import org.netbeans.spi.java.hints.Decision.Factory; -import org.netbeans.spi.java.hints.ErrorDescriptionFactory; -import org.netbeans.spi.java.hints.Hint; -import org.netbeans.spi.java.hints.HintContext; -import org.netbeans.spi.java.hints.TriggerDecision; -import org.netbeans.spi.java.hints.TriggerPattern; -import org.netbeans.spi.java.hints.TriggerTreeKind; -import org.netbeans.spi.java.hints.support.FixFactory; -import org.openide.util.NbBundle.Messages; - -/** - * - * @author lahvac - */ -@Hint(displayName="Non Private Make Final", description="Non Private Make Final", category="general") -public class NonPrivateMakeFinal { - - @TriggerPattern("$variable = $value") - public static ErrorDescription write(HintContext ctx) { - Element field = ctx.getInfo().getTrees().getElement(ctx.getVariables().get("$variable")); - - if (field == null || field.getKind() != ElementKind.FIELD) { - //unknown, or not a field, ignore. - return null; - } - - if (ctx.getInfo().getTopLevelElements().contains(ctx.getInfo().getElementUtilities().outermostTypeElement(field))) { - //field in current CU, ignore (will be handled by local flow) - return null; - } - - decision(ctx, (VariableElement) field).recordLocalFact(ctx.getInfo(), false); - - return null; - } - - @TriggerTreeKind({Kind.VARIABLE}) - public static ErrorDescription declaration(HintContext ctx) { - Element ve = ctx.getInfo().getTrees().getElement(ctx.getPath()); - - if (ve == null || ve.getKind() != ElementKind.FIELD || ve.getModifiers().contains(Modifier.FINAL) || /*TODO: the point of volatile?*/ve.getModifiers().contains(Modifier.VOLATILE)) return null; - - //handle all fields, even the private ones, which are handled by the standard hints. - - FlowResult flow = Flow.assignmentsForUse(ctx); - - if (flow == null || ctx.isCanceled()) return null; - - DecisionImpl decision = decision(ctx, (VariableElement) ve); - - decision.recordLocalFact(ctx.getInfo(), flow.getFinalCandidates().contains((VariableElement) ve)); - - return null; - } - - @TriggerDecision(DecisionImpl.class) - @Messages("FIX_CanBeFinal={0} can be final") - public static ErrorDescription produceWarning(HintContext ctx) { - if (((DecisionImpl) ctx.decision).getCurrentResult() == Boolean.TRUE) { - VariableTree vt = (VariableTree) ctx.getPath().getLeaf(); - Fix fix = FixFactory.addModifiersFix(ctx.getInfo(), new TreePath(ctx.getPath(), vt.getModifiers()), EnumSet.of(Modifier.FINAL), Bundle.FIX_CanBeFinal(vt.getName().toString())); - return ErrorDescriptionFactory.forName(ctx, ctx.getPath(), "Can be final", fix); - } - - return null; - } - - private static @NonNull DecisionImpl decision(HintContext ctx, @NonNull VariableElement field) { - TreePathHandle h = TreePathHandle.create(field, ctx.getInfo()); - - return ctx.findDecision(h, new Factory(DecisionImpl.class) { - @Override - public DecisionImpl create(TreePathHandle handle) { - return new DecisionImpl(handle); - } - }); - } - - private static final class DecisionImpl extends Decision { - - public DecisionImpl(TreePathHandle root) { - super(root); - } - - @Override - protected Boolean makeDecision(Iterable input) { - for (Boolean b : input) { - if (b == null || !b) return false; - } - return true; - } - - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/duplicates/DuplicateMethodRefactoring.java --- a/sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/duplicates/DuplicateMethodRefactoring.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.modules.jackpot30.hintsimpl.duplicates; - -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.modules.refactoring.api.AbstractRefactoring; -import org.openide.util.lookup.Lookups; - -/** - * - * @author lahvac - */ -public class DuplicateMethodRefactoring extends AbstractRefactoring { - - public DuplicateMethodRefactoring(TreePathHandle source) { - super(Lookups.singleton(source)); - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/duplicates/DuplicateMethodRefactoringAction.java --- a/sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/duplicates/DuplicateMethodRefactoringAction.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.modules.jackpot30.hintsimpl.duplicates; - -import com.sun.source.tree.Tree.Kind; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import org.netbeans.api.fileinfo.NonRecursiveFolder; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.api.java.source.ui.ScanDialog; -import org.netbeans.modules.refactoring.java.ui.ContextAnalyzer; -import org.netbeans.modules.refactoring.java.ui.JavaRefactoringUIFactory; -import org.netbeans.modules.refactoring.spi.ui.RefactoringUI; -import org.openide.awt.ActionID; -import org.openide.awt.ActionReference; -import org.openide.awt.ActionRegistration; -import org.openide.filesystems.FileObject; -import org.openide.util.NbBundle.Messages; -import org.openide.util.Utilities; - -@ActionID( - category = "Refactoring", - id = "org.netbeans.modules.jackpot30.hintsimpl.duplicates.DuplicateMethodRefactoringAction") -@ActionRegistration( - displayName = "#CTL_DuplicateMethodRefactoringAction") -@ActionReference(path = "Menu/Refactoring", position = 1120) -@Messages("CTL_DuplicateMethodRefactoringAction=Find and Replace Duplicates...") -public final class DuplicateMethodRefactoringAction implements ActionListener { - - @Override - public void actionPerformed(ActionEvent e) { - Runnable task = ContextAnalyzer.createTask(Utilities.actionsGlobalContext()/*!!!*/, new JavaRefactoringUIFactory() { - @Override public RefactoringUI create(CompilationInfo info, TreePathHandle[] handles, FileObject[] files, NonRecursiveFolder[] packages) { - //todo: more precise verification of refactoring feasibility: - return handles.length == 1 && handles[0].getKind() == Kind.METHOD ? new DuplicateMethodRefactoringUI(handles[0]) : null; - } - }); - ScanDialog.runWhenScanFinished(task, "Find&Replace Duplicates"); - } - - public boolean isEnabled() { - return ContextAnalyzer.canRefactorSingle(Utilities.actionsGlobalContext()/*!!!*/, true, true); - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/duplicates/DuplicateMethodRefactoringPlugin.java --- a/sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/duplicates/DuplicateMethodRefactoringPlugin.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,183 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.modules.jackpot30.hintsimpl.duplicates; - -import com.sun.source.tree.BlockTree; -import com.sun.source.tree.ExpressionTree; -import com.sun.source.tree.MethodInvocationTree; -import com.sun.source.tree.MethodTree; -import com.sun.source.tree.StatementTree; -import com.sun.source.util.TreePath; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import javax.lang.model.element.Element; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.VariableElement; -import org.netbeans.api.java.source.CancellableTask; -import org.netbeans.api.java.source.ClasspathInfo; -import org.netbeans.api.java.source.ClasspathInfo.PathKind; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.SourceUtils; -import org.netbeans.api.java.source.TreeMaker; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.api.java.source.WorkingCopy; -import org.netbeans.api.java.source.matching.Matcher; -import org.netbeans.api.java.source.matching.Occurrence; -import org.netbeans.api.java.source.matching.Pattern; -import org.netbeans.modules.refactoring.api.Problem; -import org.netbeans.modules.refactoring.java.spi.JavaRefactoringPlugin; -import org.netbeans.modules.refactoring.spi.RefactoringElementsBag; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; -import org.openide.filesystems.URLMapper; - -/** - * - * @author lahvac - */ -public class DuplicateMethodRefactoringPlugin extends JavaRefactoringPlugin { - private final DuplicateMethodRefactoring refactoring; - - DuplicateMethodRefactoringPlugin(DuplicateMethodRefactoring refactoring) { - this.refactoring = refactoring; - } - - @Override - public Problem preCheck() { - return null; - } - - @Override - public Problem checkParameters() { - return null; - } - - @Override - public Problem fastCheckParameters() { - return null; - } - - @Override - public void cancelRequest() { - } - - @Override - public Problem prepare(RefactoringElementsBag refactoringElements) { - final TreePathHandle source = refactoring.getRefactoringSource().lookup(TreePathHandle.class); - Set dependent = new HashSet<>(); - - for (FileObject root : ClasspathInfo.create(source.getFileObject()).getClassPath(PathKind.SOURCE).getRoots()) { - dependent.add(root.toURL()); - dependent.addAll(SourceUtils.getDependentRoots(root.toURL())); - } - - Set files = new HashSet<>(); - - for (URL root : dependent) { - FileObject rootFO = URLMapper.findFileObject(root); - - if (rootFO == null) continue; - - for (Enumeration en = rootFO.getChildren(true); en.hasMoreElements(); ){ - FileObject file = en.nextElement(); - - if (file.isData() && "text/x-java".equals(FileUtil.getMIMEType(file, "text/x-java"))) { - files.add(file); - } - } - } - - return createAndAddElements(files, new CancellableTask() { - @Override public void cancel() { - //TODO - is used? if yes, implement. - } - @Override public void run(WorkingCopy parameter) throws Exception { - if (parameter.toPhase(org.netbeans.api.java.source.JavaSource.Phase.RESOLVED).compareTo(org.netbeans.api.java.source.JavaSource.Phase.RESOLVED) < 0) { - return ; - } - - Element methodElement = source.getElementHandle().resolve(parameter); - TreePath method = parameter.getTrees().getPath(methodElement); - - if (method == null) { - //nothing to do - //TODO: create a problem - return ; - } - - BlockTree content = ((MethodTree) method.getLeaf()).getBody(); - TreePath bodyPath = new TreePath(method, content); - List statements = new ArrayList<>(); - - for (StatementTree st : content.getStatements()) { - statements.add(new TreePath(bodyPath, st)); - } - - List formalParameters = ((ExecutableElement) methodElement).getParameters(); - Pattern pattern = Pattern.createPatternWithRemappableVariables(statements, formalParameters, true); - Collection found = Matcher.create(parameter).setCancel(cancelRequested).setSearchRoot(new TreePath(parameter.getCompilationUnit())).match(pattern); - TreeMaker make = parameter.getTreeMaker(); - - for (Occurrence occ : found) { - List newParams = new ArrayList<>(); - for (VariableElement p : formalParameters) { - newParams.add((ExpressionTree) occ.getVariablesRemapToTrees().get(p).getLeaf()); - } - MethodInvocationTree newCall = make.MethodInvocation(Collections.emptyList(), make.QualIdent(methodElement), newParams); - parameter.rewrite(occ.getOccurrenceRoot().getLeaf(), make.ExpressionStatement(newCall)); - } - } - }, refactoringElements, refactoring); - } - - @Override - protected JavaSource getJavaSource(Phase p) { - return null; - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/duplicates/DuplicateMethodRefactoringUI.java --- a/sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/duplicates/DuplicateMethodRefactoringUI.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,108 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.modules.jackpot30.hintsimpl.duplicates; - -import javax.swing.event.ChangeListener; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.modules.refactoring.api.AbstractRefactoring; -import org.netbeans.modules.refactoring.api.Problem; -import org.netbeans.modules.refactoring.spi.ui.CustomRefactoringPanel; -import org.netbeans.modules.refactoring.spi.ui.RefactoringUI; -import org.openide.util.HelpCtx; - -/** - * - * @author lahvac - */ -public class DuplicateMethodRefactoringUI implements RefactoringUI { - private final TreePathHandle treePathHandle; - - DuplicateMethodRefactoringUI(TreePathHandle treePathHandle) { - this.treePathHandle = treePathHandle; - } - - @Override - public String getName() { - return "Duplicate Method Refactoring"; - } - - @Override - public String getDescription() { - return "Duplicate Method Refactoring"; - } - - @Override - public boolean isQuery() { - return false; - } - - @Override - public CustomRefactoringPanel getPanel(ChangeListener parent) { - return null; - } - - @Override - public Problem setParameters() { - return null; - } - - @Override - public Problem checkParameters() { - return null; - } - - @Override - public boolean hasParameters() { - return false; - } - - @Override - public AbstractRefactoring getRefactoring() { - return new DuplicateMethodRefactoring(treePathHandle); - } - - @Override - public HelpCtx getHelpCtx() { - return HelpCtx.DEFAULT_HELP; - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/duplicates/RefactoringPluginFactoryImpl.java --- a/sandbox/java.hints/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/duplicates/RefactoringPluginFactoryImpl.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.jackpot30.hintsimpl.duplicates; - -import org.netbeans.modules.refactoring.api.AbstractRefactoring; -import org.netbeans.modules.refactoring.spi.RefactoringPlugin; -import org.netbeans.modules.refactoring.spi.RefactoringPluginFactory; -import org.openide.util.lookup.ServiceProvider; - -/** - * - * @author Jan Lahoda - */ -@ServiceProvider(service=RefactoringPluginFactory.class) -public class RefactoringPluginFactoryImpl implements RefactoringPluginFactory { - - public RefactoringPlugin createInstance(AbstractRefactoring refactoring) { - if (refactoring instanceof DuplicateMethodRefactoring) { - return new DuplicateMethodRefactoringPlugin((DuplicateMethodRefactoring) refactoring); - } - - return null; - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/test/unit/src/org/netbeans/modules/jackpot30/hintsimpl/GlobalyUnusedNGTest.java --- a/sandbox/java.hints/hintsimpl/test/unit/src/org/netbeans/modules/jackpot30/hintsimpl/GlobalyUnusedNGTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.modules.jackpot30.hintsimpl; - -import org.junit.Test; -import org.netbeans.modules.java.hints.test.api.HintTest; - -/** - * - * @author lahvac - */ -public class GlobalyUnusedNGTest { - - @Test - public void testUsed1() throws Exception { - HintTest.create() - .input("test/Test1.java", - "package test;\n" + - "public class Test1 {\n" + - " private final Test2 test2 = null;\n" + - "}\n") - .input("test/Test2.java", - "package test;\n" + - "public class Test2 {\n" + - " private final Test1 test1 = null;\n" + - "}\n") - .runGlobal(GlobalyUnused.class) - .assertWarnings(); - } - - @Test - public void testUnused() throws Exception { - HintTest.create() - .input("test/Test1.java", - "package test;\n" + - "public class Test1 { }\n") - .input("test/Test2.java", - "package test;\n" + - "public class Test2 {\n" + - "}\n") - .runGlobal(GlobalyUnused.class) - .assertWarnings("1:13-1:18:verifier:Unused", "1:13-1:18:verifier:Unused"); - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/test/unit/src/org/netbeans/modules/jackpot30/hintsimpl/NonPrivateMakeFinalNGTest.java --- a/sandbox/java.hints/hintsimpl/test/unit/src/org/netbeans/modules/jackpot30/hintsimpl/NonPrivateMakeFinalNGTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.modules.jackpot30.hintsimpl; - -import org.junit.Test; -import org.netbeans.modules.java.hints.test.api.HintTest; - -/** - * - * @author lahvac - */ -public class NonPrivateMakeFinalNGTest { - - @Test - public void testNotFinal() throws Exception { - HintTest.create() - .input("test/Test1.java", - "package test;\n" + - "public class Test1 {\n" + - " public String str = \"\";\n" + - "}\n") - .input("test/Test2.java", - "package test;\n" + - "public class Test2 {\n" + - " {\n" + - " new Test1().str = null;\n" + - " }\n" + - "}\n") - .runGlobal(NonPrivateMakeFinal.class) - .assertWarnings(); - } - - @Test - public void testFinal() throws Exception { - HintTest.create() - .input("test/Test1.java", - "package test;\n" + - "public class Test1 {\n" + - " public String str = \"\";\n" + - "}\n") - .input("test/Test2.java", - "package test;\n" + - "public class Test2 {\n" + - " {\n" + - " System.err.println(new Test1().str);\n" + - " }\n" + - "}\n") - .runGlobal(NonPrivateMakeFinal.class) - .assertWarnings("2:18-2:21:verifier:Can be final"); - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/test/unit/src/org/netbeans/modules/jackpot30/hintsimpl/borrowed/RefactoringTestBase.java --- a/sandbox/java.hints/hintsimpl/test/unit/src/org/netbeans/modules/jackpot30/hintsimpl/borrowed/RefactoringTestBase.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,387 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ -package org.netbeans.modules.jackpot30.hintsimpl.borrowed; - -import java.io.EOFException; -import java.io.FileInputStream; -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.swing.event.ChangeListener; -import org.netbeans.api.editor.mimelookup.MimePath; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.classpath.GlobalPathRegistry; -import org.netbeans.api.java.source.SourceUtilsTestUtil; -import org.netbeans.api.java.source.TestUtilities; -import org.netbeans.api.java.source.TreeUtilities; -import org.netbeans.api.project.Project; -import org.netbeans.api.project.ProjectManager; -import org.netbeans.api.project.SourceGroup; -import org.netbeans.api.project.Sources; -import org.netbeans.core.startup.Main; -import org.netbeans.junit.NbTestCase; -import org.netbeans.modules.java.source.indexing.JavaCustomIndexer; -import org.netbeans.modules.parsing.api.indexing.IndexingManager; -import org.netbeans.modules.parsing.impl.indexing.CacheFolder; -import org.netbeans.modules.parsing.impl.indexing.MimeTypes; -import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater; -import org.netbeans.modules.refactoring.api.Problem; -import org.netbeans.spi.editor.mimelookup.MimeDataProvider; -import org.netbeans.spi.gototest.TestLocator; -import org.netbeans.spi.gototest.TestLocator.FileType; -import org.netbeans.spi.gototest.TestLocator.LocationListener; -import org.netbeans.spi.gototest.TestLocator.LocationResult; -import org.netbeans.spi.java.classpath.ClassPathProvider; -import org.netbeans.spi.java.classpath.support.ClassPathSupport; -import org.netbeans.spi.project.ProjectFactory; -import org.netbeans.spi.project.ProjectState; -import org.netbeans.spi.project.support.GenericSources; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; -import org.openide.util.Lookup; -import org.openide.util.NbBundle; -import org.openide.util.lookup.Lookups; -import org.openide.util.lookup.ServiceProvider; - -public class RefactoringTestBase extends NbTestCase { - // Turning off annoying info messages from treeutilities - private static final Logger TREEUTILITIESLOGGER = Logger.getLogger(TreeUtilities.class.getName()); - - public RefactoringTestBase(String name) { - super(name); - } - - protected static void writeFilesAndWaitForScan(FileObject sourceRoot, File... files) throws Exception { - for (FileObject c : sourceRoot.getChildren()) { - c.delete(); - } - - for (File f : files) { - FileObject fo = FileUtil.createData(sourceRoot, f.filename); - TestUtilities.copyStringToFile(fo, f.content); - } - - IndexingManager.getDefault().refreshIndexAndWait(sourceRoot.toURL(), null, true); - } - - protected void verifyContent(FileObject sourceRoot, File... files) throws Exception { - List todo = new LinkedList(); - - todo.add(sourceRoot); - - Map content = new HashMap(); - - FileUtil.refreshFor(FileUtil.toFile(sourceRoot)); - - while (!todo.isEmpty()) { - FileObject file = todo.remove(0); - - if (file.isData()) { - content.put(FileUtil.getRelativePath(sourceRoot, file), copyFileToString(FileUtil.toFile(file))); - } else { - todo.addAll(Arrays.asList(file.getChildren())); - } - } - - for (File f : files) { - String fileContent = content.remove(f.filename); - - assertNotNull(f); - assertNotNull(f.content); - assertNotNull("Cannot find " + f.filename + " in map " + content, fileContent); - assertEquals(getName() ,f.content.replaceAll("[ \t\r\n\n]+", " "), fileContent.replaceAll("[ \t\r\n\n]+", " ")); - } - - assertTrue(content.toString(), content.isEmpty()); - } - - /** - * Returns a string which contains the contents of a file. - * - * @param f the file to be read - * @return the contents of the file(s). - */ - private static String copyFileToString(java.io.File f) throws java.io.IOException { - int s = (int) f.length(); - byte[] data = new byte[s]; - int len = new FileInputStream(f).read(data); - if (len != s) { - throw new EOFException("truncated file"); - } - return new String(data, Charset.forName("UTF8")); - } - - protected static void addAllProblems(List problems, Problem head) { - while (head != null) { - problems.add(head); - head = head.getNext(); - } - } - - protected static void assertProblems(Iterable golden, Iterable real) { - Iterator g = golden.iterator(); - Iterator r = real.iterator(); - - while (g.hasNext() && r.hasNext()) { - Problem gp = g.next(); - Problem rp = r.next(); - - assertEquals(gp.isFatal(), rp.isFatal()); - assertEquals(gp.getMessage(), rp.getMessage()); - } - boolean goldenHasNext = g.hasNext(); - boolean realHasNext = r.hasNext(); - - assertFalse(goldenHasNext?"Expected: " + g.next().getMessage():"", goldenHasNext); - assertFalse(realHasNext?"Unexpected: " + r.next().getMessage():"", realHasNext); - } - - static { - NbBundle.setBranding("test"); - } - - protected static final class File { - public final String filename; - public final String content; - - public File(String filename, String content) { - this.filename = filename; - this.content = content; - } - } - - protected FileObject src; - protected FileObject test; - protected Project prj; - private ClassPath sourcePath; - - @Override - protected void setUp() throws Exception { - System.setProperty("org.netbeans.modules.java.source.usages.SourceAnalyser.fullIndex", "true"); - TREEUTILITIESLOGGER.setLevel(Level.SEVERE); - MimeTypes.setAllMimeTypes(new HashSet()); - SourceUtilsTestUtil.prepareTest(new String[] {"org/netbeans/modules/openide/loaders/layer.xml", - "org/netbeans/modules/java/source/resources/layer.xml", - "org/netbeans/modules/java/editor/resources/layer.xml", - /*"org/netbeans/modules/refactoring/java/test/resources/layer.xml", */"META-INF/generated-layer.xml"}, new Object[] { - new ClassPathProvider() { - @Override - public ClassPath findClassPath(FileObject file, String type) { - if (sourcePath != null && sourcePath.contains(file)){ - if (ClassPath.BOOT.equals(type)) { - return ClassPathSupport.createClassPath(System.getProperty("sun.boot.class.path")); - } - if (ClassPath.COMPILE.equals(type)) { - return ClassPathSupport.createClassPath(new FileObject[0]); - } - if (ClassPath.SOURCE.equals(type)) { - return sourcePath; - } - } - - return null; - } - }, - new ProjectFactory() { - @Override - public boolean isProject(FileObject projectDirectory) { - return src != null && src.getParent() == projectDirectory; - } - @Override - public Project loadProject(final FileObject projectDirectory, ProjectState state) throws IOException { - if (!isProject(projectDirectory)) { - return null; - } - return new Project() { - @Override - public FileObject getProjectDirectory() { - return projectDirectory; - } - @Override - public Lookup getLookup() { - final Project p = this; - return Lookups.singleton(new Sources() { - - @Override - public SourceGroup[] getSourceGroups(String type) { - return new SourceGroup[] {GenericSources.group(p, src.getParent(), "source", "Java Sources", null, null), - GenericSources.group(p, test, "testsources", "Test Sources", null, null)}; - } - - @Override - public void addChangeListener(ChangeListener listener) { - } - - @Override - public void removeChangeListener(ChangeListener listener) { - } - }); - } - }; - } - @Override - public void saveProject(Project project) throws IOException, ClassCastException {} - }, - new TestLocator() { - - @Override - public boolean appliesTo(FileObject fo) { - return true; - } - - @Override - public boolean asynchronous() { - return false; - } - - @Override - public LocationResult findOpposite(FileObject fo, int caretOffset) { - ClassPath srcCp; - - if ((srcCp = ClassPath.getClassPath(fo, ClassPath.SOURCE)) == null) { - return new LocationResult("File not found"); //NOI18N - } - - String baseResName = srcCp.getResourceName(fo, '/', false); - String testResName = getTestResName(baseResName, fo.getExt()); - assert testResName != null; - FileObject fileObject = test.getFileObject(testResName); - if(fileObject != null) { - return new LocationResult(fileObject, -1); - } - - return new LocationResult("File not found"); //NOI18N - } - - @Override - public void findOpposite(FileObject fo, int caretOffset, LocationListener callback) { - throw new UnsupportedOperationException("This should not be called on synchronous locators."); - } - - @Override - public FileType getFileType(FileObject fo) { - if(FileUtil.isParentOf(test, fo)) { - return FileType.TEST; - } else if(FileUtil.isParentOf(src, fo)) { - return FileType.TESTED; - } - return FileType.NEITHER; - } - - private String getTestResName(String baseResName, String ext) { - StringBuilder buf - = new StringBuilder(baseResName.length() + ext.length() + 10); - buf.append(baseResName).append("Test"); //NOI18N - if (ext.length() != 0) { - buf.append('.').append(ext); - } - return buf.toString(); - } - }}); - Main.initializeURLFactory(); - org.netbeans.api.project.ui.OpenProjects.getDefault().getOpenProjects(); - prepareTest(); - org.netbeans.api.project.ui.OpenProjects.getDefault().open(new Project[] {prj = ProjectManager.getDefault().findProject(src.getParent())}, false); - MimeTypes.setAllMimeTypes(Collections.singleton("text/x-java")); - sourcePath = ClassPathSupport.createClassPath(src, test); - GlobalPathRegistry.getDefault().register(ClassPath.SOURCE, new ClassPath[] {sourcePath}); - RepositoryUpdater.getDefault().start(true); - super.setUp(); - FileUtil.createData(FileUtil.getConfigRoot(), "Templates/Classes/Empty.java"); - System.setProperty("org.netbeans.modules.parsing.impl.Source.excludedTasks", ".*"); - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - GlobalPathRegistry.getDefault().unregister(ClassPath.SOURCE, new ClassPath[] {sourcePath}); - org.netbeans.api.project.ui.OpenProjects.getDefault().close(new Project[] {prj}); - prj = null; - } - - private void prepareTest() throws Exception { - FileObject workdir = SourceUtilsTestUtil.makeScratchDir(this); - - FileObject projectFolder = FileUtil.createFolder(workdir, "testProject"); - src = FileUtil.createFolder(projectFolder, "src"); - test = FileUtil.createFolder(projectFolder, "test"); - - FileObject cache = FileUtil.createFolder(workdir, "cache"); - - CacheFolder.setCacheFolder(cache); - } - - @ServiceProvider(service=MimeDataProvider.class) - public static final class MimeDataProviderImpl implements MimeDataProvider { - - private static final Lookup L = Lookups.singleton(new JavaCustomIndexer.Factory()); - - @Override - public Lookup getLookup(MimePath mimePath) { - if ("text/x-java".equals(mimePath.getPath())) { - return L; - } - - return null; - } - - } - - protected static boolean problemIsFatal(List problems) { - for (Problem problem : problems) { - Problem next = problem; - do { - if (next.isFatal()) { - return true; - } - next = next.getNext(); - } while (next != null); - } - return false; - } -} \ No newline at end of file diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/hintsimpl/test/unit/src/org/netbeans/modules/jackpot30/hintsimpl/duplicates/DuplicateMethodRefactoringPluginTest.java --- a/sandbox/java.hints/hintsimpl/test/unit/src/org/netbeans/modules/jackpot30/hintsimpl/duplicates/DuplicateMethodRefactoringPluginTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,165 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.modules.jackpot30.hintsimpl.duplicates; - -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.util.ElementFilter; -import org.netbeans.api.java.source.CompilationController; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.Task; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.modules.jackpot30.hintsimpl.borrowed.RefactoringTestBase; -import org.netbeans.modules.refactoring.api.Problem; -import org.netbeans.modules.refactoring.api.RefactoringSession; - -/** - * - * @author lahvac - */ -public class DuplicateMethodRefactoringPluginTest extends RefactoringTestBase { - - public DuplicateMethodRefactoringPluginTest(String name) { - super(name); - } - - public void testSimple() throws Exception { - writeFilesAndWaitForScan(src, - new File("test/Test.java", - "package test;\n" + - "public class Test {\n" + - " public static void toCall() {\n" + - " System.err.println(1);\n" + - " }\n" + - " public static void test1() {\n" + - " System.err.println(1);\n" + - " }\n" + - " public static void test2() {\n" + - " System.out.println(1);\n" + - " }\n" + - " public static void test3() {\n" + - " System.err.println(2);\n" + - " }\n" + - "}\n")); - performDuplicateMethod("toCall"); - verifyContent(src, - new File("test/Test.java", - "package test;\n" + - "public class Test {\n" + - " public static void toCall() {\n" + - " System.err.println(1);\n" + - " }\n" + - " public static void test1() {\n" + - " toCall();\n" + - " }\n" + - " public static void test2() {\n" + - " System.out.println(1);\n" + - " }\n" + - " public static void test3() {\n" + - " System.err.println(2);\n" + - " }\n" + - "}\n")); - } - - public void testParams() throws Exception { - writeFilesAndWaitForScan(src, - new File("test/Test.java", - "package test;\n" + - "public class Test {\n" + - " public static void toCall(int i) {\n" + - " System.err.println(i);\n" + - " }\n" + - " public static void test1(int j) {\n" + - " System.err.println(1 + j);\n" + - " }\n" + - " public static void test3() {\n" + - " System.err.println(2);\n" + - " }\n" + - "}\n")); - performDuplicateMethod("toCall"); - verifyContent(src, - new File("test/Test.java", - "package test;\n" + - "public class Test {\n" + - " public static void toCall(int i) {\n" + - " System.err.println(i);\n" + - " }\n" + - " public static void test1(int j) {\n" + - " toCall(1 + j);\n" + - " }\n" + - " public static void test3() {\n" + - " toCall(2);\n" + - " }\n" + - "}\n")); - } - - private void performDuplicateMethod(final String methodName, Problem... expectedProblems) throws Exception { - final DuplicateMethodRefactoring[] r = new DuplicateMethodRefactoring[1]; - - JavaSource.forFileObject(src.getFileObject("test/Test.java")).runUserActionTask(new Task() { - @Override public void run(CompilationController javac) throws Exception { - javac.toPhase(JavaSource.Phase.RESOLVED); - - for (ExecutableElement method : ElementFilter.methodsIn(javac.getTopLevelElements().get(0).getEnclosedElements())) { - if (method.getSimpleName().contentEquals(methodName)) { - r[0] = new DuplicateMethodRefactoring(TreePathHandle.create(javac.getTrees().getPath(method), javac)); - } - } - } - }, true); - - RefactoringSession rs = RefactoringSession.create("Session"); - List problems = new LinkedList(); - - addAllProblems(problems, r[0].preCheck()); - if (!problemIsFatal(problems)) { - addAllProblems(problems, r[0].prepare(rs)); - } - if (!problemIsFatal(problems)) { - addAllProblems(problems, rs.doRefactoring(true)); - } - - assertProblems(Arrays.asList(expectedProblems), problems); - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/apichanges.xml --- a/sandbox/java.hints/java.hints.test/apichanges.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,181 +0,0 @@ - - - - - - - - - - - - - Java Hints Test API - - - - - - - - Allowed to check a single hint - - - - - - New method run(Class, String) was added so that hint with a specific ID can be run, if the - class contains multiple hint implementations. - - - - - - - Added assertFixes method to HintWarning - - - - - - HintTest.HintWarning.applyFix now enforces constraints for Inspect&Transform. Unless a hint - is marked as Options.QUERY, Options.NO_BULK or Kind.ACTION, - the Fix that is being applied is tested to be JavaFix and repeatable, - which are the requirements of Inspect&Transform. - - - - - - - - Added assertFixes method to HintWarning - - - - - - Added assertFixes method to HintWarning - - - - - - - - - - - - - Change History for the Editor Hints SPI - - - - -

Overview

- -

Introduction

- -

This document lists changes made to the Editor Hints SPI.

- - -
- - -

@FOOTER@

- - - - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/arch.xml --- a/sandbox/java.hints/java.hints.test/arch.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1078 +0,0 @@ - - -]> - - - - &api-questions; - - - - -

- - API to create tests for the custom Java hints. - -

- - - - - - -

- XXX no answer for arch-quality -

- - - - - - -

- XXX no answer for arch-time -

- - - - - - -

- XXX no answer for arch-usecases -

- - - - - - -

- XXX no answer for arch-what -

- - - - - - - - - - - - - -

- XXX no answer for compat-deprecation -

- - - - - - -

- XXX no answer for compat-i18n -

- - - - - - -

- XXX no answer for compat-standards -

- - - - - - -

- XXX no answer for compat-version -

- - - - - - -

- XXX no answer for dep-jre -

- - - - - - -

- XXX no answer for dep-jrejdk -

- - - - - - - - - - - - - -

- XXX no answer for dep-non-nb -

- - - - - - -

- XXX no answer for dep-platform -

- - - - - - -

- XXX no answer for deploy-dependencies -

- - - - - - -

- XXX no answer for deploy-jar -

- - - - - - -

- XXX no answer for deploy-nbm -

- - - - - - -

- XXX no answer for deploy-packages -

- - - - - - -

- XXX no answer for deploy-shared -

- - - - - - -

- XXX no answer for exec-ant-tasks -

- - - - - - -

- XXX no answer for exec-classloader -

- - - - - - -

- XXX no answer for exec-component -

- - - - - - -

- XXX no answer for exec-introspection -

- - - - - - -

- XXX no answer for exec-privateaccess -

- - - - - - -

- XXX no answer for exec-process -

- - - - - - -

- XXX no answer for exec-property -

- - - - - - -

- XXX no answer for exec-reflection -

- - - - - - -

- XXX no answer for exec-threading -

- - - - - - -

- XXX no answer for format-clipboard -

- - - - - - -

- XXX no answer for format-dnd -

- - - - - - -

- XXX no answer for format-types -

- - - - - - -

- XXX no answer for lookup-lookup -

- - - - - - -

- XXX no answer for lookup-register -

- - - - - - -

- XXX no answer for lookup-remove -

- - - - - - -

- XXX no answer for perf-exit -

- - - - - - -

- XXX no answer for perf-huge_dialogs -

- - - - - - -

- XXX no answer for perf-limit -

- - - - - - -

- XXX no answer for perf-mem -

- - - - - - -

- XXX no answer for perf-menus -

- - - - - - -

- XXX no answer for perf-progress -

- - - - - - -

- XXX no answer for perf-scale -

- - - - - - -

- XXX no answer for perf-spi -

- - - - - - -

- XXX no answer for perf-startup -

- - - - - - -

- XXX no answer for perf-wakeup -

- - - - - - -

- XXX no answer for resources-file -

- - - - - - -

- XXX no answer for resources-layer -

- - - - - - -

- XXX no answer for resources-mask -

- - - - - - -

- XXX no answer for resources-preferences -

- - - - - - -

- XXX no answer for resources-read -

- - - - - - -

- XXX no answer for security-grant -

- - - - - - -

- XXX no answer for security-policy -

- - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/build.xml --- a/sandbox/java.hints/java.hints.test/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project org.netbeans.modules.java.hints.test. - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/manifest.mf --- a/sandbox/java.hints/java.hints.test/manifest.mf Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -Manifest-Version: 1.0 -OpenIDE-Module: org.netbeans.modules.java.hints.test/1 -OpenIDE-Module-Implementation-Version: 1 -OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/hints/test/Bundle.properties - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/nbproject/build-impl.xml --- a/sandbox/java.hints/java.hints.test/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ - - - - - - - - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/nbproject/genfiles.properties --- a/sandbox/java.hints/java.hints.test/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -build.xml.data.CRC32=bdfc486d -build.xml.script.CRC32=fb578ef0 -build.xml.stylesheet.CRC32=a56c6a5b@2.70 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=bdfc486d -nbproject/build-impl.xml.script.CRC32=c676886e -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70 diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/nbproject/org-netbeans-modules-java-hints-test.sig --- a/sandbox/java.hints/java.hints.test/nbproject/org-netbeans-modules-java-hints-test.sig Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -#Signature file v4.1 -#Version 1.6.1 - -CLSS public java.lang.Object -cons public init() -meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException -meth protected void finalize() throws java.lang.Throwable -meth public boolean equals(java.lang.Object) -meth public final java.lang.Class getClass() -meth public final void notify() -meth public final void notifyAll() -meth public final void wait() throws java.lang.InterruptedException -meth public final void wait(long) throws java.lang.InterruptedException -meth public final void wait(long,int) throws java.lang.InterruptedException -meth public int hashCode() -meth public java.lang.String toString() - -CLSS public org.netbeans.modules.java.hints.test.api.HintTest -innr public final AppliedFix -innr public final HintOutput -innr public final HintWarning -meth public !varargs org.netbeans.modules.java.hints.test.api.HintTest classpath(java.net.URL[]) -meth public org.netbeans.modules.java.hints.test.api.HintTest input(java.lang.String) throws java.lang.Exception -meth public org.netbeans.modules.java.hints.test.api.HintTest input(java.lang.String,boolean) throws java.lang.Exception -meth public org.netbeans.modules.java.hints.test.api.HintTest input(java.lang.String,java.lang.String) throws java.lang.Exception -meth public org.netbeans.modules.java.hints.test.api.HintTest input(java.lang.String,java.lang.String,boolean) throws java.lang.Exception -meth public org.netbeans.modules.java.hints.test.api.HintTest preference(java.lang.String,boolean) -meth public org.netbeans.modules.java.hints.test.api.HintTest preference(java.lang.String,int) -meth public org.netbeans.modules.java.hints.test.api.HintTest preference(java.lang.String,java.lang.String) -meth public org.netbeans.modules.java.hints.test.api.HintTest setCaretMarker(char) -meth public org.netbeans.modules.java.hints.test.api.HintTest sourceLevel(java.lang.String) -meth public org.netbeans.modules.java.hints.test.api.HintTest$HintOutput run(java.lang.Class) throws java.lang.Exception -meth public static org.netbeans.modules.java.hints.test.api.HintTest create() throws java.lang.Exception -supr java.lang.Object -hfds DEBUGGING_HELPER,ERRORS_COMPARATOR,INDEXING_LOGGER,JUNIT_PROPERTIES_FILENAME,JUNIT_PROPERTIES_LOCATION_PROPERTY,NBJUNIT_WORKDIR,bootClassPath,buildRoot,cache,caret,caretMarker,checkCompilable,compileClassPath,log,sourceLevel,sourcePath,sourceRoot,testFile,testPreferences,usedPaths,workDir -hcls DeadlockTask,TempPreferences,TestProxyClassPathProvider,TestSourceForBinaryQuery,TestSourceLevelQueryImplementation - -CLSS public final org.netbeans.modules.java.hints.test.api.HintTest$AppliedFix - outer org.netbeans.modules.java.hints.test.api.HintTest -cons public init(org.netbeans.modules.java.hints.test.api.HintTest) -meth public java.lang.String getOutput() throws java.lang.Exception -meth public java.lang.String getOutput(java.lang.String) throws java.lang.Exception -meth public org.netbeans.modules.java.hints.test.api.HintTest$AppliedFix assertCompilable() throws java.lang.Exception -meth public org.netbeans.modules.java.hints.test.api.HintTest$AppliedFix assertCompilable(java.lang.String) throws java.lang.Exception -meth public org.netbeans.modules.java.hints.test.api.HintTest$AppliedFix assertOutput(java.lang.String) throws java.lang.Exception -meth public org.netbeans.modules.java.hints.test.api.HintTest$AppliedFix assertOutput(java.lang.String,java.lang.String) throws java.lang.Exception -meth public org.netbeans.modules.java.hints.test.api.HintTest$AppliedFix assertVerbatimOutput(java.lang.String) throws java.lang.Exception -meth public org.netbeans.modules.java.hints.test.api.HintTest$AppliedFix assertVerbatimOutput(java.lang.String,java.lang.String) throws java.lang.Exception -supr java.lang.Object - -CLSS public final org.netbeans.modules.java.hints.test.api.HintTest$HintOutput - outer org.netbeans.modules.java.hints.test.api.HintTest -meth public !varargs org.netbeans.modules.java.hints.test.api.HintTest$HintOutput assertContainsWarnings(java.lang.String[]) -meth public !varargs org.netbeans.modules.java.hints.test.api.HintTest$HintOutput assertNotContainsWarnings(java.lang.String[]) -meth public !varargs org.netbeans.modules.java.hints.test.api.HintTest$HintOutput assertWarnings(java.lang.String[]) -meth public org.netbeans.modules.java.hints.test.api.HintTest$HintWarning findWarning(java.lang.String) -supr java.lang.Object -hfds errors - -CLSS public final org.netbeans.modules.java.hints.test.api.HintTest$HintWarning - outer org.netbeans.modules.java.hints.test.api.HintTest -meth public !varargs org.netbeans.modules.java.hints.test.api.HintTest$HintWarning assertFixes(java.lang.String[]) throws java.lang.Exception -meth public org.netbeans.modules.java.hints.test.api.HintTest$AppliedFix applyFix() throws java.lang.Exception -meth public org.netbeans.modules.java.hints.test.api.HintTest$AppliedFix applyFix(java.lang.String) throws java.lang.Exception -supr java.lang.Object -hfds warning - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/nbproject/project.properties --- a/sandbox/java.hints/java.hints.test/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -is.autoload=true -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial -spec.version.base=2.0.0 -javadoc.arch=${basedir}/arch.xml -javadoc.apichanges=${basedir}/apichanges.xml -requires.nb.javac=true -spec.version.base.fatal.warning=false diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/nbproject/project.xml --- a/sandbox/java.hints/java.hints.test/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,276 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - org.netbeans.modules.java.hints.test - - - - org.netbeans.api.annotations.common - - - - 1 - 1.13 - - - - org.netbeans.api.java - - - - 1 - 1.37 - - - - org.netbeans.api.java.classpath - - - - 1 - 1.32 - - - - org.netbeans.api.progress - - - - 1 - 1.33 - - - - org.netbeans.core.startup - - - - 1 - 1.41 - - - - org.netbeans.libs.javacapi - - - - 7.9 - - - - org.netbeans.libs.junit4 - - - - 1.13 - - - - org.netbeans.modules.code.analysis - - - - 0 - - - - - org.netbeans.modules.editor.mimelookup - - - - 1 - 1.25 - - - - org.netbeans.modules.java.lexer - - - - 1 - 1.17 - - - - org.netbeans.modules.java.source - - - - - - - - org.netbeans.modules.java.source.base - - - - - - - - org.netbeans.modules.lexer - - - - 2 - 1.43 - - - - org.netbeans.modules.nbjunit - - - - 1 - 1.74 - - - - org.netbeans.modules.parsing.api - - - - 1 - - - - - org.netbeans.modules.parsing.indexing - - - - - - - - org.netbeans.modules.projectapi - - - - 1 - 1.41 - - - - org.netbeans.modules.projectuiapi - - - - 1 - 1.54 - - - - org.netbeans.modules.projectuiapi.base - - - - 1 - 1.79.0.9 - - - - org.netbeans.modules.refactoring.api - - - - 1.34 - - - - org.netbeans.spi.editor.hints - - - - 0-1 - 1.22 - - - - org.netbeans.spi.java.hints - - - - - - - - org.openide.filesystems - - - - 7.55 - - - - org.openide.loaders - - - - 7.33 - - - - org.openide.nodes - - - - 7.26 - - - - org.openide.text - - - - 6.44 - - - - org.openide.util - - - - 8.20 - - - - org.openide.util.lookup - - - - 8.12 - - - - org.openide.util.ui - - - - 9.3 - - - - - - unit - - org.netbeans.modules.parsing.nb - - - - - org.netbeans.modules.projectapi.nb - - - - - - org.netbeans.modules.java.hints.test.api - - - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/nbproject/suite.properties --- a/sandbox/java.hints/java.hints.test/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/src/org/netbeans/modules/java/hints/test/Bundle.properties --- a/sandbox/java.hints/java.hints.test/src/org/netbeans/modules/java/hints/test/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -OpenIDE-Module-Name=Java Hints Test API diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/src/org/netbeans/modules/java/hints/test/Utilities.java --- a/sandbox/java.hints/java.hints.test/src/org/netbeans/modules/java/hints/test/Utilities.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,104 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2012 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.test; - -import org.netbeans.api.editor.mimelookup.MimePath; -import org.netbeans.modules.java.source.indexing.JavaCustomIndexer; -import org.netbeans.modules.java.source.parsing.JavacParser; -import org.netbeans.modules.java.source.parsing.JavacParserFactory; -import org.netbeans.spi.editor.mimelookup.MimeDataProvider; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.MIMEResolver; -import org.openide.util.Lookup; -import org.openide.util.lookup.Lookups; -import org.openide.util.lookup.ProxyLookup; -import org.openide.util.lookup.ServiceProvider; - -/** - * - * @author lahvac - */ -public class Utilities { - - @ServiceProvider(service = Lookup.class) - public static final class TestLookup extends ProxyLookup { - - public void setLookupsImpl(Lookup... lookups) { - setLookups(lookups); - } - - } - - @ServiceProvider(service=MimeDataProvider.class) - public static final class JavacParserProvider implements MimeDataProvider { - - private Lookup javaLookup = Lookups.fixed(new JavacParserFactory(), new JavaCustomIndexer.Factory()); - - public Lookup getLookup(MimePath mimePath) { - if (mimePath.getPath().endsWith(JavacParser.MIME_TYPE)) { - return javaLookup; - } - - return Lookup.EMPTY; - } - - } - - @ServiceProvider(service=MIMEResolver.class) - public static final class JavaMimeResolver extends MIMEResolver { - - public JavaMimeResolver() { - super(JavacParser.MIME_TYPE); - } - - @Override - public String findMIMEType(FileObject fo) { - if ("java".equals(fo.getExt())) { - return JavacParser.MIME_TYPE; - } - - return null; - } - - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java --- a/sandbox/java.hints/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1427 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2012 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.test.api; - -import com.sun.source.tree.CompilationUnitTree; -import com.sun.source.util.TreePath; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.lang.ref.Reference; -import java.lang.ref.WeakReference; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.IdentityHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.Logger; -import java.util.prefs.AbstractPreferences; -import java.util.prefs.BackingStoreException; -import java.util.prefs.Preferences; -import java.util.regex.Pattern; -import javax.swing.event.ChangeListener; -import javax.swing.text.Document; -import javax.tools.Diagnostic; -import junit.framework.Assert; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNotSame; -import static junit.framework.Assert.assertTrue; - -import org.netbeans.api.editor.mimelookup.MimeLookup; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.lexer.JavaTokenId; -import org.netbeans.api.java.queries.SourceForBinaryQuery; -import org.netbeans.api.java.source.ClasspathInfo; -import org.netbeans.api.java.source.CompilationController; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.JavaSource.Phase; -import org.netbeans.api.java.source.ModificationResult; -import org.netbeans.api.java.source.ModificationResult.Difference; -import org.netbeans.api.java.source.Task; -import org.netbeans.api.java.source.WorkingCopy; -import org.netbeans.api.lexer.Language; -import org.netbeans.api.project.ui.*; -import org.netbeans.core.startup.Main; -import org.netbeans.junit.NbTestCase; -import org.netbeans.modules.java.JavaDataLoader; -import org.netbeans.modules.java.hints.providers.code.CodeHintProviderImpl; -import org.netbeans.modules.java.hints.providers.code.FSWrapper; -import org.netbeans.modules.java.hints.providers.code.FSWrapper.ClassWrapper; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import org.netbeans.modules.java.hints.providers.spi.HintDescription.Worker; -import org.netbeans.modules.java.hints.providers.spi.HintDescriptionFactory; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata.Options; -import org.netbeans.modules.java.hints.spiimpl.JavaFixImpl; -import org.netbeans.modules.java.hints.spiimpl.JavaFixImpl.Accessor; -import org.netbeans.modules.java.hints.spiimpl.MessageImpl; -import org.netbeans.modules.java.hints.spiimpl.SyntheticFix; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.BatchResult; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Folder; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Resource; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Scope; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.VerifiedSpansCallBack; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchUtilities; -import org.netbeans.modules.java.hints.spiimpl.batch.ProgressHandleWrapper; -import org.netbeans.modules.java.hints.spiimpl.batch.Scopes; -import org.netbeans.modules.java.hints.spiimpl.hints.HintsInvoker; -import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings; -import org.netbeans.modules.java.hints.test.Utilities.TestLookup; -import org.netbeans.modules.java.source.JavaSourceAccessor; -import org.netbeans.modules.java.source.TreeLoader; -import org.netbeans.modules.parsing.api.indexing.IndexingManager; -import org.netbeans.modules.parsing.impl.indexing.CacheFolder; -import org.netbeans.modules.parsing.impl.indexing.MimeTypes; -import org.netbeans.modules.refactoring.spi.RefactoringElementImplementation; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.editor.hints.Fix; -import org.netbeans.spi.editor.hints.Severity; -import org.netbeans.spi.java.classpath.ClassPathProvider; -import org.netbeans.spi.java.classpath.support.ClassPathSupport; -import org.netbeans.spi.java.hints.Hint.Kind; -import org.netbeans.spi.java.hints.HintContext; -import org.netbeans.spi.java.hints.JavaFix; -import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation; -import org.netbeans.spi.java.queries.SourceLevelQueryImplementation; -import org.openide.LifecycleManager; -import org.openide.cookies.EditorCookie; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileStateInvalidException; -import org.openide.filesystems.FileSystem; -import org.openide.filesystems.FileUtil; -import org.openide.filesystems.MultiFileSystem; -import org.openide.filesystems.Repository; -import org.openide.filesystems.URLMapper; -import org.openide.filesystems.XMLFileSystem; -import org.openide.loaders.DataObject; -import org.openide.loaders.DataObjectNotFoundException; -import org.openide.util.Exceptions; -import org.openide.util.Lookup; -import org.openide.util.NbBundle; -import org.openide.util.lookup.Lookups; - -/**A support class for writing a test for a Java Hint. A test verifying that correct - * warnings are produced should look like: - * 
- * HintTest.create()
- *         .input("<input Java source code>")
- *         .run(<class containg the hint>)
- *         .assertWarnings("<required warning(s)>");
- *
- * - * Note: when verifying that no warnings are produced in a particular situation, - * do not pass any warnings to the {@code assertWarnings} method. - * - * A test verifying that a hint's transformation is correct: - * 
- * HintTest.create()
- *         .input("<input Java source code>")
- *         .run(<class containg the hint>)
- *         .findWarning("<a warning produce by the hint>")
- *         .applyFix() //fill apply the only fix in the given ErrorDescription
- *         .assertCompilable()
- *         .assertOutput("<output Java source code>");
- *
- * - * All the tests run under the {@code test} branding, which allows to specify test values - * for bundle keys for warning and fix in {@code Bundle_test.properties}, to isolate the - * test from changes in the production {@code Bundle.properties}. - * - * @author lahvac - */ -public class HintTest { - - private static final Logger INDEXING_LOGGER = /* RepositoryUpdater.UI_LOGGER */ Logger.getLogger("org.netbeans.ui.indexing"); - static { - INDEXING_LOGGER.setLevel(Level.WARNING); - } - - private final File workDir; - private final FileObject sourceRoot; - private final FileObject buildRoot; - private final FileObject cache; - private final Preferences testPreferences; - private final HintsSettings hintSettings; - private final List checkCompilable = new ArrayList(); - private final List testFiles = new ArrayList(); - private String sourceLevel = "1.5"; - private Character caretMarker; - private FileObject testFile; - private int caret = -1; - private ClassPath sourcePath; - private ClassPath compileClassPath = ClassPathSupport.createClassPath(new URL[0]); - - private HintTest() throws Exception { - List layers = new LinkedList(); - - for (String layer : new String[] {"META-INF/generated-layer.xml"}) { - boolean found = false; - - for (Enumeration en = Thread.currentThread().getContextClassLoader().getResources(layer); en.hasMoreElements(); ) { - found = true; - layers.add(en.nextElement()); - } - - Assert.assertTrue(layer, found); - } - - XMLFileSystem xmlFS = new XMLFileSystem(); - xmlFS.setXmlUrls(layers.toArray(new URL[0])); - - FileSystem system = new MultiFileSystem(new FileSystem[] {FileUtil.createMemoryFileSystem(), xmlFS}); - - Repository repository = new Repository(system); - - assertEquals(Lookup.getDefault().getClass().getCanonicalName(), TestLookup.class, Lookup.getDefault().getClass()); - - ((TestLookup) Lookup.getDefault()).setLookupsImpl( - Lookups.fixed(repository, - new TestProxyClassPathProvider(), - new TestSourceForBinaryQuery(), - new TestSourceLevelQueryImplementation(), - JavaDataLoader.findObject(JavaDataLoader.class, true)), - Lookups.metaInfServices(HintTest.class.getClassLoader()), - Lookups.singleton(HintTest.class.getClassLoader()) - ); - - Set amt = MimeTypes.getAllMimeTypes(); - if (amt == null) { - amt = new HashSet(); - } else { - amt = new HashSet(amt); - } - amt.add("text/x-java"); - MimeTypes.setAllMimeTypes(amt); - org.netbeans.api.project.ui.OpenProjects.getDefault().getOpenProjects(); - - TreeLoader.DISABLE_CONFINEMENT_TEST = true; - testPreferences = new TempPreferences(); - hintSettings = new HintsSettings() { - @Override public boolean isEnabled(HintMetadata hint) { - return true; - } - @Override public void setEnabled(HintMetadata hint, boolean value) { - throw new UnsupportedOperationException("Not supported."); - } - @Override public Preferences getHintPreferences(HintMetadata hint) { - return testPreferences; - } - @Override public Severity getSeverity(HintMetadata hint) { - return hint.severity; - } - @Override public void setSeverity(HintMetadata hint, Severity severity) { - throw new UnsupportedOperationException("Not supported."); - } - }; - - workDir = getWorkDir(); - deleteSubFiles(workDir); - FileUtil.refreshFor(workDir); - - FileObject wd = FileUtil.toFileObject(workDir); - - assertNotNull(wd); - - sourceRoot = FileUtil.createFolder(wd, "src"); - buildRoot = FileUtil.createFolder(wd, "build"); - cache = FileUtil.createFolder(wd, "cache"); - - CacheFolder.setCacheFolder(cache); - - NbBundle.setBranding("test"); - - sourcePath = ClassPathSupport.createClassPath(sourceRoot); - - Main.initializeURLFactory(); - } - - /**Bootstraps the test framework. - * - * @return the test framework - call more methods on it to set-up a test, then call {@code run} method and assert results. - */ - public static HintTest create() throws Exception { - return new HintTest(); - } - - /**A character to use as a marker of a caret in the input code. The caret position - * during the run method will be set to the position of this character in the first input file. - * - * @param c a caret marker - * @return itself - */ - public HintTest setCaretMarker(char c) { - this.caretMarker = c; - return this; - } - - /**Use the specified {@link java.net.URL}s as compile classpath while parsing - * the Java input. The {@link java.net.URL}s need to be "folder" {@link java.net.URL}s, - * ready to be passed to {@link ClassPathSupport#createClassPath(java.net.URL[]) }. - * - * @param entries that should become roots of the compile classpath - * @return itself - * @see FileUtil#urlForArchiveOrDir(java.io.File) - * @see FileUtil#getArchiveRoot(java.net.URL) - */ - public HintTest classpath(URL... entries) { - compileClassPath = ClassPathSupport.createClassPath(entries); - return this; - } - - /**Create a test file. Equivalent to calling {@code input("test/Test.java", code, true)}. - * - * @param code the content of the newly created test file - * @return itself - */ - public HintTest input(String code) throws Exception { - return input("test/Test.java", code, true); - } - - /**Create a test file. Equivalent to calling {@code input("test/Test.java", code, compilable)}. - * - * @param code the content of the newly created test file - * @param compilable if true, it will be verified that the file does not contain - * compilation errors before the hint is run on it - * @return itself - */ - public HintTest input(String code, boolean compilable) throws Exception { - return input("test/Test.java", code, compilable); - } - - /**Create a test file. Equivalent to calling {@code input(fileName, code, true)}. - * - * @param fileName a relative file name of the newly created file from a (automatically created) source root - * @param code the content of the newly created test file - * @return itself - */ - public HintTest input(String fileName, String code) throws Exception { - return input(fileName, code, true); - } - - /**Create a test file. Any number of files can be created for one test, but the hint - * will be run only on the first one. - * - * @param fileName a relative file name of the newly created file from a (automatically created) source root - * @param code the content of the newly created test file - * @param compilable if true, it will be verified that the file does not contain - * compilation errors before the hint is run on it - * @return itself - */ - public HintTest input(String fileName, String code, boolean compilable) throws Exception { - int caret = -1; - - if (caretMarker != null && testFile == null) { - caret = code.indexOf(caretMarker); - - assertNotSame("A caret location must be specified", -1, caret); - - code = code.substring(0, caret) + code.substring(caret + 1); - } - - FileObject file = FileUtil.createData(sourceRoot, fileName); - - copyStringToFile(file, code); - - if (compilable) { - checkCompilable.add(file); - } - - if (testFile == null) { - testFile = file; - this.caret = caret; - } - - testFiles.add(file); - - return this; - } - - private void ensureCompilable(FileObject file) throws IOException, AssertionError, IllegalArgumentException { - CompilationInfo info = parse(file); - - assertNotNull(info); - - for (Diagnostic d : info.getDiagnostics()) { - if (d.getKind() == Diagnostic.Kind.ERROR) - throw new AssertionError(d.getLineNumber() + ":" + d.getColumnNumber() + " " + d.getMessage(null)); - } - } - - /**Sets a source level for all Java files used in this test. - * - * @param sourceLevel the source level to use while parsing Java files - * @return itself - */ - public HintTest sourceLevel(String sourceLevel) { - this.sourceLevel = sourceLevel; - return this; - } - - /**Sets a preference that will be visible to the hint. - * - * @param preferencesKey a key for the preferences - * @param value the value to set - * @return itself - */ - public HintTest preference(String preferencesKey, String value) { - this.testPreferences.put(preferencesKey, value); - return this; - } - - /**Sets a preference that will be visible to the hint. - * - * @param preferencesKey a key for the preferences - * @param value the value to set - * @return itself - */ - public HintTest preference(String preferencesKey, int value) { - this.testPreferences.putInt(preferencesKey, value); - return this; - } - - /**Sets a preference that will be visible to the hint. - * - * @param preferencesKey a key for the preferences - * @param value the value to set - * @return itself - */ - public HintTest preference(String preferencesKey, boolean value) { - this.testPreferences.putBoolean(preferencesKey, value); - return this; - } - - /**Runs the given hint(s) on the first file written by a {@code input} method. - * - * @param hint all hints in this class will be run on the file - * @return a wrapper over the hint output that allows verifying results of the hint - */ - public HintOutput run(Class hint) throws Exception { - return run(hint, null); - } - - /**Runs the given hint(s) on the first file written by a {@code input} method. - * Runs only hints with the specified {@code hintCode}. Null hintCode includes - * all hints from the class - * - * @param hint all hints in this class will be run on the file - * @param hintCode if not {@code null}, only hints with the same id will be run - * @return a wrapper over the hint output that allows verifying results of the hint - */ - public HintOutput run(Class hint, String hintCode) throws Exception { - return runImpl(hint, hintCode, new HintComputer() { - @Override public Collection computeHints(List total) throws Exception { - CompilationInfo info = parse(testFile); - - assertNotNull(info); - - List result = new ArrayList(); - - Map> errors = computeErrors(info, total, new AtomicBoolean()); - - for (Entry> e : errors.entrySet()) { - result.addAll(e.getValue()); - } - - Reference infoRef = new WeakReference(info); - Reference cut = new WeakReference(info.getCompilationUnit()); - - info = null; - - DEBUGGING_HELPER.add(result); - NbTestCase.assertGC("noone holds CompilationInfo", infoRef); - NbTestCase.assertGC("noone holds javac", cut); - DEBUGGING_HELPER.remove(result); - - return result; - } - }); - } - - private HintOutput runImpl(Class hint, String hintCode, HintComputer doComputeErrors) throws Exception { - IndexingManager.getDefault().refreshIndexAndWait(sourceRoot.toURL(), null); - - for (FileObject file : checkCompilable) { - ensureCompilable(file); - } - - Map> hints = new HashMap>(); - List found = new ArrayList(); - - for (ClassWrapper w : FSWrapper.listClasses()) { - if (hint.getCanonicalName().equals(w.getName().replace('$', '.'))) { - found.add(w); - } - } - - assertFalse(found.isEmpty()); - - for (ClassWrapper w : found) { - CodeHintProviderImpl.processClass(w, hints); - } - - List total = new LinkedList(); - final Set requiresJavaFix = Collections.newSetFromMap(new IdentityHashMap()); - - for (final Entry> e : hints.entrySet()) { - if (null != hintCode && !e.getKey().id.equals(hintCode)) { - continue; - } - if ( e.getKey().options.contains(Options.NO_BATCH) - || e.getKey().options.contains(Options.QUERY) - || e.getKey().kind == Kind.ACTION) { - total.addAll(e.getValue()); - continue; - } - for (final HintDescription hd : e.getValue()) { - total.add(HintDescriptionFactory.create() - .setTrigger(hd.getTrigger()) - .setMetadata(e.getKey()) - .setAdditionalConstraints(hd.getAdditionalConstraints()) - .addOptions(hd.getOptions().toArray(new Options[0])) - .setWorker(new Worker() { - @Override public Collection createErrors(HintContext ctx) { - Collection errors = hd.getWorker().createErrors(ctx); - - if (errors != null) { - for (ErrorDescription ed : errors) { - requiresJavaFix.add(ed); - } - } - - return errors; - } - }) - .produce()); - } - } - - Handler h = new Handler() { - @Override public void publish(LogRecord record) { - if ( record.getLevel().intValue() >= Level.WARNING.intValue() - && record.getThrown() != null) { - throw new IllegalStateException(record.getThrown()); - } - } - @Override public void flush() { } - @Override public void close() throws SecurityException { } - }; - - Logger log = Logger.getLogger(Exceptions.class.getName()); - log.addHandler(h); - List result = new ArrayList(doComputeErrors.computeHints(total)); - log.removeHandler(h); - - Collections.sort(result, ERRORS_COMPARATOR); - - return new HintOutput(result, requiresJavaFix); - } - - private interface HintComputer { - public Collection computeHints(List total) throws Exception; - } - - public HintOutput runGlobal(Class hint) throws Exception { - return runImpl(hint, null, new HintComputer() { - @Override public Collection computeHints(List total) throws Exception { - final List result = new ArrayList(); - Scope s = Scopes.specifiedFoldersScope(Folder.convert(sourceRoot)); - BatchResult batchResult = BatchSearch.findOccurrences(total, s); - BatchSearch.getVerifiedSpans(batchResult, new ProgressHandleWrapper(1, 1), new VerifiedSpansCallBack() { - @Override public void groupStarted() { } - @Override public boolean spansVerified(CompilationController wc, Resource r, Collection hints) throws Exception { - result.addAll(hints); - return true; - } - @Override public void groupFinished() { } - @Override public void cannotVerifySpan(Resource r) { } - }, false, new ArrayList(), new AtomicBoolean()); - - return result; - } - }); - } - - //must keep the error descriptions (and their Fixes through them) in a field - //so that assertGC is able to provide a useful trace of references: - private static Set> DEBUGGING_HELPER = Collections.newSetFromMap(new IdentityHashMap, Boolean>()); - - private CompilationInfo parse(FileObject file) throws DataObjectNotFoundException, IllegalArgumentException, IOException { - DataObject od = DataObject.find(file); - EditorCookie ec = od.getLookup().lookup(EditorCookie.class); - - assertNotNull(ec); - - Document doc = ec.openDocument(); - - doc.putProperty(Language.class, JavaTokenId.language()); - doc.putProperty("mimeType", "text/x-java"); - - JavaSource js = JavaSource.create(ClasspathInfo.create(file), file); - - assertNotNull("found JavaSource for " + file, js); - - final DeadlockTask bt = new DeadlockTask(Phase.RESOLVED); - - js.runUserActionTask(bt, true); - - return bt.info; - } - - private Map> computeErrors(CompilationInfo info, Iterable hints, AtomicBoolean cancel) { - return new HintsInvoker(hintSettings, caret, cancel).computeHints(info, new TreePath(info.getCompilationUnit()), hints, new LinkedList()); - } - - FileObject getSourceRoot() { - return sourceRoot; - } - - private static class TempPreferences extends AbstractPreferences { - - /*private*/Properties properties; - - private TempPreferences() { - super(null, ""); - } - - private TempPreferences(TempPreferences parent, String name) { - super(parent, name); - newNode = true; - } - - protected final String getSpi(String key) { - return properties().getProperty(key); - } - - protected final String[] childrenNamesSpi() throws BackingStoreException { - return new String[0]; - } - - protected final String[] keysSpi() throws BackingStoreException { - return properties().keySet().toArray(new String[0]); - } - - protected final void putSpi(String key, String value) { - properties().put(key,value); - } - - protected final void removeSpi(String key) { - properties().remove(key); - } - - protected final void removeNodeSpi() throws BackingStoreException {} - protected void flushSpi() throws BackingStoreException {} - protected void syncSpi() throws BackingStoreException { - properties().clear(); - } - - @Override - public void put(String key, String value) { - try { - super.put(key, value); - } catch (IllegalArgumentException iae) { - if (iae.getMessage().contains("too long")) { - // Not for us! - putSpi(key, value); - } else { - throw iae; - } - } - } - - Properties properties() { - if (properties == null) { - properties = new Properties(); - } - return properties; - } - - protected AbstractPreferences childSpi(String name) { - return new TempPreferences(this, name); - } - } - - private class TestSourceForBinaryQuery implements SourceForBinaryQueryImplementation { - - public SourceForBinaryQuery.Result findSourceRoots(URL binaryRoot) { - FileObject f = URLMapper.findFileObject(binaryRoot); - - if (buildRoot.equals(f)) { - return new SourceForBinaryQuery.Result() { - public FileObject[] getRoots() { - return new FileObject[] { - sourceRoot, - }; - } - - public void addChangeListener(ChangeListener l) { - } - - public void removeChangeListener(ChangeListener l) { - } - }; - } - - return null; - } - - } - - private static List bootClassPath; - - private static Logger log = Logger.getLogger(HintTest.class.getName()); - - private static synchronized List getBootClassPath() { - if (bootClassPath == null) { - try { - String cp = System.getProperty("sun.boot.class.path"); - List urls = new ArrayList(); - String[] paths = cp.split(Pattern.quote(System.getProperty("path.separator"))); - - for (String path : paths) { - File f = new File(path); - - if (!f.canRead()) - continue; - - FileObject fo = FileUtil.toFileObject(f); - - if (FileUtil.isArchiveFile(fo)) { - fo = FileUtil.getArchiveRoot(fo); - } - - if (fo != null) { - urls.add(fo.getURL()); - } - } - - bootClassPath = urls; - } catch (FileStateInvalidException e) { - if (log.isLoggable(Level.SEVERE)) - log.log(Level.SEVERE, e.getMessage(), e); - } - } - - return bootClassPath; - } - - private class TestProxyClassPathProvider implements ClassPathProvider { - - public ClassPath findClassPath(FileObject file, String type) { - try { - if (ClassPath.BOOT == type) { - // XXX simpler to use JavaPlatformManager.getDefault().getDefaultPlatform().getBootstrapLibraries() - return ClassPathSupport.createClassPath(getBootClassPath().toArray(new URL[0])); - } - - if (ClassPath.SOURCE == type) { - return sourcePath; - } - - if (ClassPath.COMPILE == type) { - return compileClassPath; - } - - if (ClassPath.EXECUTE == type) { - return ClassPathSupport.createClassPath(new FileObject[] { - buildRoot - }); - } - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - } - - private class TestSourceLevelQueryImplementation implements SourceLevelQueryImplementation { - - public String getSourceLevel(FileObject javaFile) { - return sourceLevel; - } - - } - - - private static class DeadlockTask implements Task { - - private final Phase phase; - private CompilationInfo info; - - public DeadlockTask(Phase phase) { - assert phase != null; - this.phase = phase; - } - - public void run( CompilationController info ) { - try { - info.toPhase(this.phase); - this.info = info; - } catch (IOException ioe) { - if (log.isLoggable(Level.SEVERE)) - log.log(Level.SEVERE, ioe.getMessage(), ioe); - } - } - - } - - /**Encapsulated the output of the hint. - */ - public final class HintOutput { - - private final List errors; - private final Set requiresJavaFix; - - private HintOutput(List errors, Set requiresJavaFix) { - this.errors = errors; - this.requiresJavaFix = requiresJavaFix; - - } - - /**Assert that the hint(s) produced the given warnings. The provided strings - * should match {@code toString()} results of {@link ErrorDescription}s produced - * by the hint(s). - * - * @param warnings expected {@code toString()} results of {@link ErrorDescription}s produced - * by the hint - * @return itself - * @throws AssertionError if the given warnings do not match the actual warnings - */ - public HintOutput assertWarnings(String... warnings) { - assertEquals("The warnings provided by the hint do not match expected warnings.", Arrays.toString(warnings), errors.toString()); - - return this; - } - - /**Assert that the hint(s) produced warnings include the given warnings. The provided strings - * should match {@code toString()} results of {@link ErrorDescription}s produced - * by the hint(s). - * - * @param warnings expected {@code toString()} results of {@link ErrorDescription}s produced - * by the hint - * @return itself - * @throws AssertionError if the given warnings do not match the actual warnings - */ - public HintOutput assertContainsWarnings(String... warnings) { - Set goldenSet = new HashSet(Arrays.asList(warnings)); - List errorsNames = new LinkedList(); - - for (ErrorDescription d : errors) { - goldenSet.remove(d.toString()); - errorsNames.add(d.toString()); - } - - assertTrue("The warnings provided by the hint do not contain expected warnings. Provided warnings: " + errorsNames.toString(), goldenSet.isEmpty()); - - return this; - } - - /**Assert that the hint(s) produced warnings do not include the given warnings. The provided strings - * should match {@code toString()} results of {@link ErrorDescription}s produced - * by the hint(s). - * - * @param warnings expected {@code toString()} results of {@link ErrorDescription}s produced - * by the hint - * @return itself - * @throws AssertionError if the given warnings do not match the actual warnings - */ - public HintOutput assertNotContainsWarnings(String... warnings) { - Set goldenSet = new HashSet(Arrays.asList(warnings)); - List errorsNames = new LinkedList(); - - boolean fail = false; - for (ErrorDescription d : errors) { - if (goldenSet.remove(d.getDescription())) - fail = true; - errorsNames.add(d.toString()); - } - - assertFalse("The warnings provided by the hint do not exclude expected warnings. Provided warnings: " + errorsNames.toString(), fail); - - return this; - } - - /**Find a specific warning. - * - * @param warning the warning to find - must be equivalent to {@code toString()} - * results of the {@link ErrorDescription}. - * @return a wrapper about the given specific warnings - * @throws AssertionError if the given warning cannot be found - */ - public HintWarning findWarning(String warning) { - ErrorDescription toFix = null; - - for (ErrorDescription d : errors) { - if (warning.equals(d.toString())) { - toFix = d; - break; - } - } - - assertNotNull("Warning: \"" + warning + "\" not found. All ErrorDescriptions: " + errors.toString(), toFix); - - return new HintWarning(toFix, requiresJavaFix.contains(toFix)); - } - } - - /**A wrapper over a single warning. - */ - public final class HintWarning { - private final ErrorDescription warning; - private final boolean requiresJavaFix; - HintWarning(ErrorDescription warning, boolean requiresJavaFix) { - this.warning = warning; - this.requiresJavaFix = requiresJavaFix; - } - /**Applies the only fix of the current warning. Fails if the given warning - * does not have exactly one fix. - * - * Note this is a destructive operation - the {@link #run(java.lang.Class)} or {@link #applyFix} - * cannot be run in the future on any object that follows the chain from the same invocation of {@link #create()}. - * - * @return a wrapper over resulting source code - * @throws AssertionError if there is not one fix for the given {@link ErrorDescription} - */ - public AppliedFix applyFix() throws Exception { - return applyFix(true); - } - - AppliedFix applyFix(boolean saveAll) throws Exception { - assertTrue("Must be computed", warning.getFixes().isComputed()); - - List fixes = warning.getFixes().getFixes(); - - assertEquals(1, fixes.size()); - - doApplyFix(fixes.get(0)); - - if (saveAll) - LifecycleManager.getDefault().saveAll(); - - return new AppliedFix(); - } - /**Applies the specified fix of the current warning. - * - * Note this is a destructive operation - the {@link #run(java.lang.Class)} or {@link #applyFix} - * cannot be run in the future on any object that follows the chain from the same invocation of {@link #create()}. - * - * @param fix {@link Fix#getText() } result of the required fix - * @return a wrapper over resulting source code - * @throws AssertionError if the fix cannot be found - */ - public AppliedFix applyFix(String fix) throws Exception { - assertTrue("Must be computed", warning.getFixes().isComputed()); - - List fixes = warning.getFixes().getFixes(); - List fixNames = new LinkedList(); - Fix toApply = null; - - for (Fix f : fixes) { - if (fix.equals(f.getText())) { - toApply = f; - } - - fixNames.add(f.getText()); - } - - assertNotNull("Cannot find fix to invoke: " + fixNames.toString(), toApply); - - doApplyFix(toApply); - - LifecycleManager.getDefault().saveAll(); - - return new AppliedFix(); - } - private void doApplyFix(Fix f) throws Exception { - Preferences preferences = MimeLookup.getLookup(JavaTokenId.language().mimeType()).lookup(Preferences.class); - preferences.putBoolean("importInnerClasses", true); - try { - if (requiresJavaFix) { - assertTrue("The fix must be a JavaFix", f instanceof JavaFixImpl); - - ModificationResult result1 = runJavaFix(((JavaFixImpl) f).jf); - ModificationResult result2 = runJavaFix(((JavaFixImpl) f).jf); - - //ensure the results are the same: - assertEquals("The fix must be repeatable", result1.getModifiedFileObjects(), result2.getModifiedFileObjects()); - - for (FileObject file : result1.getModifiedFileObjects()) { - assertEquals("The fix must be repeatable", result1.getResultingSource(file), result2.getResultingSource(file)); - } - - result1.commit(); - } else { - f.implement(); - } - } finally { - preferences.remove("importInnerClasses"); - } - } - private ModificationResult runJavaFix(final JavaFix jf) throws IOException { - FileObject file = Accessor.INSTANCE.getFile(jf); - JavaSource js = JavaSource.forFileObject(file); - final Map> changes = new HashMap>(); - - ModificationResult mr = js.runModificationTask(new Task() { - public void run(WorkingCopy wc) throws Exception { - if (wc.toPhase(Phase.RESOLVED).compareTo(Phase.RESOLVED) < 0) { - return; - } - - Map resourceContentChanges = new HashMap(); - Accessor.INSTANCE.process(jf, wc, true, resourceContentChanges, /*Ignored for now:*/new ArrayList()); - BatchUtilities.addResourceContentChanges(resourceContentChanges, changes); - - } - }); - - changes.putAll(JavaSourceAccessor.getINSTANCE().getDiffsFromModificationResult(mr)); - - return JavaSourceAccessor.getINSTANCE().createModificationResult(changes, Collections.emptyMap()); - } - /**Verifies that the current warning provides the given fixes. - * - * @param fixes the {@link Fix#getText() } of the expected fixes - * @return itself - * @throws AssertionError if the expected fixes do not match the provided fixes - * @since 1.1 - */ - public HintWarning assertFixes(String... expectedFixes) throws Exception { - assertTrue("Must be computed", warning.getFixes().isComputed()); - - List fixNames = new LinkedList(); - - for (Fix f : warning.getFixes().getFixes()) { - if (f instanceof SyntheticFix) continue; - fixNames.add(f.getText()); - } - - assertEquals("Fixes for the current warning do not match the expected fixes. All fixes: " + fixNames.toString(), Arrays.asList(expectedFixes), fixNames); - - return this; - } - } - - /**A wrapper over result after applying a fix. - */ - public final class AppliedFix { - /**Require that the result is compilable. Equivalent to {@code assertCompilable("test/Test.java")} - * - * @return the wrapper itself - * @throws AssertionError if the result is not compilable - */ - public AppliedFix assertCompilable() throws Exception { - return assertCompilable("test/Test.java"); - } - /**Require that the given resulting file is compilable. - * - * @param fileName the name of the file that should be verified - * @return the wrapper itself - * @throws AssertionError if the result is not compilable - */ - public AppliedFix assertCompilable(String fileName) throws Exception { - FileObject toCheck = sourceRoot.getFileObject(fileName); - - assertNotNull(toCheck); - - ensureCompilable(toCheck); - return this; - } - /**Verify the content of the resulting file. Equivalent to {@code assertOutput("test/Test.java")}. - * - * This method will "normalize" whitespaces in the file: generally, all - * whitespaces are reduced to a single space both in the given code and - * the code read from the file, before the comparison. - * - * @param code expected content of the resulting file. - * @return the wrapper itself - * @throws AssertionError if the file does not have the correct content - */ - public AppliedFix assertOutput(String code) throws Exception { - return assertOutput("test/Test.java", code); - } - /**Verify the content of the given resulting file. - * - * This method will "normalize" whitespaces in the file: generally, all - * whitespaces are reduced to a single space both in the given code and - * the code read from the file, before the comparison. - * - * @param fileName the name of the file that should be verified - * @param code expected content of the resulting file. - * @return the wrapper itself - * @throws AssertionError if the file does not have the correct content - */ - public AppliedFix assertOutput(String fileName, String code) throws Exception { - FileObject toCheck = sourceRoot.getFileObject(fileName); - - assertNotNull("Required file: " + fileName + " not found", toCheck); - - DataObject toCheckDO = DataObject.find(toCheck); - EditorCookie ec = toCheckDO.getLookup().lookup(EditorCookie.class); - Document toCheckDocument = ec.openDocument(); - - String realCode = toCheckDocument.getText(0, toCheckDocument.getLength()); - - //ignore whitespaces: - realCode = reduceWhitespaces(realCode); - - assertEquals("The output code does not match the expected code.", reduceWhitespaces(code), realCode); - - return this; - } - - private String reduceWhitespaces(String str) { - StringBuilder result = new StringBuilder(); - int i = 0; - boolean wasWhitespace = false; - - while (i < str.length()) { - int codePoint = str.codePointAt(i); - - if (Character.isWhitespace(codePoint)) { - if (!wasWhitespace) { - result.append(" "); - wasWhitespace = true; - } - } else { - result.appendCodePoint(codePoint); - wasWhitespace = false; - } - i += Character.charCount(codePoint); - } - - return result.toString(); - } - - /**Verify the content of the resulting file. Equivalent to {@code assertVerbatimOutput("test/Test.java")}. - * - * This method will compare the content of the file exactly with the provided - * code. - * - * @param fileName the name of the file that should be verified - * @param code expected content of the resulting file. - * @return the wrapper itself - * @throws AssertionError if the result is not compilable - */ - public AppliedFix assertVerbatimOutput(String code) throws Exception { - return assertVerbatimOutput("test/Test.java", code); - } - /**Verify the content of the given resulting file. - * - * This method will compare the content of the file exactly with the provided - * code. - * - * @param fileName the name of the file that should be verified - * @param code expected content of the resulting file. - * @return the wrapper itself - * @throws AssertionError if the result is not compilable - */ - public AppliedFix assertVerbatimOutput(String fileName, String code) throws Exception { - FileObject toCheck = sourceRoot.getFileObject(fileName); - - assertNotNull(toCheck); - - DataObject toCheckDO = DataObject.find(toCheck); - EditorCookie ec = toCheckDO.getLookup().lookup(EditorCookie.class); - Document toCheckDocument = ec.openDocument(); - - String realCode = toCheckDocument.getText(0, toCheckDocument.getLength()); - - assertEquals("The output code does not match the expected code.", code, realCode); - - return this; - } - - /**Return code after the fix has been applied. - * - * @return the code after the fix has been applied - */ - public String getOutput() throws Exception { - return getOutput("test/Test.java"); - } - - /**Return code after the fix has been applied. - * - * @param fileName file for which the code should be returned - * @return the code after the fix has been applied - */ - public String getOutput(String fileName) throws Exception { - FileObject toCheck = sourceRoot.getFileObject(fileName); - - assertNotNull(toCheck); - - DataObject toCheckDO = DataObject.find(toCheck); - EditorCookie ec = toCheckDO.getLookup().lookup(EditorCookie.class); - Document toCheckDocument = ec.openDocument(); - - return toCheckDocument.getText(0, toCheckDocument.getLength()); - } - } - - private static final Comparator ERRORS_COMPARATOR = new Comparator () { - - public int compare (ErrorDescription e1, ErrorDescription e2) { - return e1.getRange ().getBegin ().getOffset () - e2.getRange ().getBegin ().getOffset (); - } - }; - - static { - System.setProperty("org.openide.util.Lookup", TestLookup.class.getName()); - Assert.assertEquals(TestLookup.class, Lookup.getDefault().getClass()); - } - - //workdir computation (copied from NbTestCase): - private static File getWorkDir() throws IOException { - // now we have path, so if not available, create workdir - File workdir = FileUtil.normalizeFile(new File(getWorkDirPath())); - if (workdir.exists()) { - if (!workdir.isDirectory()) { - // work dir exists, but is not directory - this should not happen - // trow exception - throw new IOException("workdir exists, but is not a directory, workdir = " + workdir); - } else { - // everything looks correctly, return the path - return workdir; - } - } else { - // we need to create it - boolean result = workdir.mkdirs(); - if (result == false) { - // mkdirs() failed - throw an exception - throw new IOException("workdir creation failed: " + workdir); - } else { - // everything looks ok - return path - return workdir; - } - } - } - - private static String getWorkDirPath() { - StackTraceElement caller = null; - boolean seenItself = false; - - for (StackTraceElement e : new Exception().getStackTrace()) { - if (HintTest.class.getName().equals(e.getClassName())) seenItself = true; - if (seenItself && !HintTest.class.getName().equals(e.getClassName())) { - caller = e; - break; - } - } - - String name = caller != null ? caller.getMethodName() : "unknownTest"; - // start - PerformanceTestCase overrides getName() method and then - // name can contain illegal characters - String osName = System.getProperty("os.name"); - if (osName != null && osName.startsWith("Windows")) { - char ntfsIllegal[] ={'"','/','\\','?','<','>','|',':'}; - for (int i=0; i tooLong) { - clazz = abbrevDots(clazz); - len2 = clazz.length(); - } - - if (len1 + len2 + len3 > tooLong) { - name = abbrevCapitals(name); - } - - String p = workDirPath + File.separator + clazz + File.separator + name; - String realP; - - for (int i = 0; ; i++) { - realP = i == 0 ? p : p + "-" + i; - if (usedPaths.add(realP)) { - break; - } - } - - return realP; - } - - private static Set usedPaths = new HashSet(); - - private static String abbrevDots(String dotted) { - StringBuilder sb = new StringBuilder(); - String sep = ""; - for (String item : dotted.split("\\.")) { - sb.append(sep); - sb.append(item.charAt(0)); - sep = "."; - } - return sb.toString(); - } - - private static String abbrevCapitals(String name) { - if (name.startsWith("test")) { - name = name.substring(4); - } - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < name.length(); i++) { - if (Character.isUpperCase(name.charAt(i))) { - sb.append(Character.toLowerCase(name.charAt(i))); - } - } - return sb.toString(); - } - - private static final String JUNIT_PROPERTIES_FILENAME = "junit.properties"; - private static final String JUNIT_PROPERTIES_LOCATION_PROPERTY = "junit.properties.file"; - private static final String NBJUNIT_WORKDIR = "nbjunit.workdir"; - - private static String getWorkDirPathFromManager() { - String path = System.getProperty(NBJUNIT_WORKDIR); - - if (path == null) { - // try to get property from user's settings - path = readProperties().getProperty(NBJUNIT_WORKDIR); - } - if (path != null) { - path = path.replace('/', File.separatorChar); - } else { - // Fallback value, guaranteed to be defined. - path = System.getProperty("java.io.tmpdir") + File.separatorChar + "tests-" + System.getProperty("user.name"); - } - return path; - } - - private static Properties readProperties() { - Properties result = new Properties(); - try { - File propFile = getPreferencesFile(); - FileInputStream is = new FileInputStream(propFile); - try { - result.load(is); - } finally { - is.close(); - } - } catch (IOException e) { - } - - return result; - } - - private static File getPreferencesFile() { - String junitPropertiesLocation = System.getProperty(JUNIT_PROPERTIES_LOCATION_PROPERTY); - if (junitPropertiesLocation != null) { - File propertyFile = new File(junitPropertiesLocation); - if (propertyFile.exists()) { - return propertyFile; - } - } - // property file was not found - lets fall back to defaults - String home= System.getProperty("user.home"); - return new File(home, JUNIT_PROPERTIES_FILENAME); - } - - // private method for deleting a file/directory (and all its subdirectories/files) - private static void deleteFile(File file) throws IOException { - if (file.isDirectory() && file.equals(file.getCanonicalFile())) { - // file is a directory - delete sub files first - File files[] = file.listFiles(); - for (int i = 0; i < files.length; i++) { - deleteFile(files[i]); - } - - } - // file is a File :-) - boolean result = file.delete(); - if (result == false ) { - // a problem has appeared - throw new IOException("Cannot delete file, file = "+file.getPath()); - } - } - - // private method for deleting every subfiles/subdirectories of a file object - private static void deleteSubFiles(File file) throws IOException { - File files[] = file.getCanonicalFile().listFiles(); - if (files != null) { - for (File f : files) { - deleteFile(f); - } - } else { - // probably do nothing - file is not a directory - } - } - - private static FileObject copyStringToFile (FileObject f, String content) throws Exception { - OutputStream os = f.getOutputStream(); - os.write(content.getBytes("UTF-8")); - os.close (); - - return f; - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/src/org/netbeans/modules/parsing/impl/indexing/MimeTypes.java --- a/sandbox/java.hints/java.hints.test/src/org/netbeans/modules/parsing/impl/indexing/MimeTypes.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2011 Sun Microsystems, Inc. - */ -package org.netbeans.modules.parsing.impl.indexing; - -import java.util.Set; -import org.netbeans.api.annotations.common.CheckForNull; -import org.netbeans.api.annotations.common.NonNull; -import org.openide.util.Parameters; - -/**Not an API! - * - * @author Tomas Zezula - */ -public class MimeTypes { - - private MimeTypes() {} - - public static void setAllMimeTypes(@NonNull final Set allMimeTypes) { - Parameters.notNull("allMimeTypes", allMimeTypes); //NOI18N - Util.allMimeTypes = allMimeTypes; - } - - @CheckForNull - public static Set getAllMimeTypes() { - return Util.allMimeTypes; - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/java.hints.test/test/unit/src/org/netbeans/modules/java/hints/test/api/HintTestTest.java --- a/sandbox/java.hints/java.hints.test/test/unit/src/org/netbeans/modules/java/hints/test/api/HintTestTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,336 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2012 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.test.api; - -import com.sun.source.tree.Tree.Kind; -import com.sun.source.util.TreePath; -import java.io.ByteArrayOutputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Reader; -import java.io.Writer; -import javax.swing.text.Document; -import org.junit.Assert; -import org.junit.Test; -import org.netbeans.api.java.source.ClasspathInfo.PathKind; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.spi.editor.hints.ChangeInfo; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.editor.hints.Fix; -import org.netbeans.spi.java.hints.ErrorDescriptionFactory; -import org.netbeans.spi.java.hints.Hint; -import org.netbeans.spi.java.hints.HintContext; -import org.netbeans.spi.java.hints.JavaFix; -import org.netbeans.spi.java.hints.JavaFix.TransformationContext; -import org.netbeans.spi.java.hints.TriggerTreeKind; -import org.openide.LifecycleManager; -import org.openide.cookies.EditorCookie; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; -import org.openide.loaders.DataObject; - -/** - * - * @author lahvac - */ -public class HintTestTest { - - public HintTestTest() { - } - - @Test - public void testNonJavaChanges() throws Exception { - HintTest.create() - .input("package test;\n" + - "public class Test { }\n") - .input("test/test.txt", "1\n2\n", false) - .run(NonJavaChanges.class) - .findWarning("1:13-1:17:verifier:Test") - .applyFix() - .assertVerbatimOutput("test/test.txt", "2\n3\n"); - } - - @Test - public void test220070() throws Exception { - HintTest.create() - .input("package test;\n" + - "public class Test { }\n") - .input("test/test.txt", "1\n2\n", false) - .run(NonJavaChanges.class) - .findWarning("1:13-1:17:verifier:Test") - .applyFix() - .assertOutput("test/test.txt", "2\r3\r"); - } - - @Test - public void testNonJavaChangesOpenedInEditor() throws Exception { - try { - HintTest ht = HintTest.create() - .input("package test;\n" + - "public class Test { }\n") - .input("test/test.txt", "1\n2\n", false); - FileObject resource = ht.getSourceRoot().getFileObject("test/test.txt"); - DataObject od = DataObject.find(resource); - EditorCookie ec = od.getLookup().lookup(EditorCookie.class); - Document doc = ec.openDocument(); - doc.remove(0, doc.getLength()); - doc.insertString(0, "5\n6\n", null); - ht.run(NonJavaChanges.class) - .findWarning("1:13-1:17:verifier:Test") - .applyFix(false) - .assertVerbatimOutput("test/test.txt", "6\n7\n"); - Assert.assertEquals("1\n2\n", resource.asText("UTF-8")); - Assert.assertEquals("6\n7\n", doc.getText(0, doc.getLength())); - } finally { - LifecycleManager.getDefault().saveAll(); - } - } - - @Hint(displayName="testingNonJavaChanges", description="testingNonJavaChanges", category="test") - public static final class NonJavaChanges { - @TriggerTreeKind(Kind.CLASS) - public static ErrorDescription hint(HintContext ctx) { - return ErrorDescriptionFactory.forName(ctx, ctx.getPath(), "Test", new TestingNonJavaChangesFix(ctx.getInfo(), ctx.getPath()).toEditorFix()); - } - } - - private static final class TestingNonJavaChangesFix extends JavaFix { - - public TestingNonJavaChangesFix(CompilationInfo info, TreePath tp) { - super(info, tp); - } - - @Override protected String getText() { - return "Test"; - } - - @Override protected void performRewrite(TransformationContext ctx) { - try { - FileObject resource = ctx.getWorkingCopy().getFileObject().getParent().getFileObject("test.txt"); - Assert.assertNotNull(resource); - Reader r = new InputStreamReader(ctx.getResourceContent(resource), "UTF-8"); - ByteArrayOutputStream outData = new ByteArrayOutputStream(); - Writer w = new OutputStreamWriter(outData, "UTF-8"); - int read; - - while ((read = r.read()) != -1) { - if (read != '\n') read++; - w.write(read); - } - - r.close(); - w.close(); - - OutputStream out = ctx.getResourceOutput(resource); - - out.write(outData.toByteArray()); - - out.close(); - } catch (Exception ex) { - throw new IllegalStateException(ex); - } - } - - } - - @Test - public void testMeaningfullSourcePath() throws Exception { - HintTest.create() - .input("package test;\n" + - "public class Test { }\n") - .run(MeaningfullSourcePath.class) - .assertWarnings(); - } - - @Hint(displayName="meaningfullSourcePath", description="meaningfullSourcePath", category="test") - public static final class MeaningfullSourcePath { - @TriggerTreeKind(Kind.CLASS) - public static ErrorDescription hint(HintContext ctx) { - if (ctx.getInfo().getClasspathInfo().getClassPath(PathKind.SOURCE).findOwnerRoot(ctx.getInfo().getFileObject()) == null) { - return ErrorDescriptionFactory.forTree(ctx, ctx.getPath(), "Broken Source Path"); - } - - return null; - } - } - - @Test - public void testCompilationClassPath() throws Exception { - HintTest.create() - .input("package test;\n" + - "public class Test { }\n") - .classpath(FileUtil.getArchiveRoot(JavaSource.class.getProtectionDomain().getCodeSource().getLocation())) - .run(CompilationClassPath.class) - .assertWarnings(); - } - - @Hint(displayName="compilationClassPath", description="compilationClassPath", category="test") - public static final class CompilationClassPath { - @TriggerTreeKind(Kind.CLASS) - public static ErrorDescription hint(HintContext ctx) { - FileObject clazz = ctx.getInfo().getClasspathInfo().getClassPath(PathKind.COMPILE).findResource("org/netbeans/api/java/source/JavaSource.class"); - - if (clazz == null) { - return ErrorDescriptionFactory.forTree(ctx, ctx.getPath(), "Broken Compilation ClassPath"); - } - - return null; - } - } - - @Test - public void testHintThrowsException() throws Exception { - HintTest ht = HintTest.create() - .input("package test;\n" + - "public class Test { }\n"); - try { - ht.run(HintThrowsException.class); - Assert.fail("No exception thrown"); - } catch (Exception ex) { - //ok - Assert.assertEquals(IllegalStateException.class, ex.getClass()); - Assert.assertNotNull(ex.getCause()); - Assert.assertEquals(NullPointerException.class, ex.getCause().getClass()); - Assert.assertEquals("a", ex.getCause().getMessage()); - } - } - - @Hint(displayName="hintThrowsException", description="hintThrowsException", category="test") - public static final class HintThrowsException { - @TriggerTreeKind(Kind.CLASS) - public static ErrorDescription hint(HintContext ctx) { - throw new NullPointerException("a"); - } - } - - @Test - public void testNonJavaFix() throws Exception { - HintTest ht = HintTest.create() - .input("package test;\n" + - "public class Test { }\n"); - try { - ht.run(NonJavaFix.class) - .findWarning("1:0-1:21:verifier:Test") - .applyFix(); - Assert.fail("No exception thrown"); - } catch (AssertionError ae) { - //ok - Assert.assertEquals("The fix must be a JavaFix", ae.getMessage()); - } - } - - @Hint(displayName="nonJavaFix", description="nonJavaFix", category="test") - public static final class NonJavaFix { - @TriggerTreeKind(Kind.CLASS) - public static ErrorDescription hint(HintContext ctx) { - return ErrorDescriptionFactory.forTree(ctx, ctx.getPath(), "Test", new Fix() { - @Override public String getText() { - return "Fix"; - } - @Override public ChangeInfo implement() throws Exception { - return null; - } - }); - } - } - - @Test - public void testNotRepeatableJavaFix() throws Exception { - HintTest ht = HintTest.create() - .input("package test;\n" + - "public class Test { }\n"); - try { - ht.run(NotRepeatableJavaFix.class) - .findWarning("1:0-1:21:verifier:Test") - .applyFix(); - Assert.fail("No exception thrown"); - } catch (AssertionError ae) { - //ok - Assert.assertTrue(ae.getMessage().startsWith("The fix must be repeatable")); - } - } - - @Hint(displayName="notRepeatableJavaFix", description="notRepeatableJavaFix", category="test") - public static final class NotRepeatableJavaFix { - @TriggerTreeKind(Kind.CLASS) - public static ErrorDescription hint(HintContext ctx) { - Fix f = new JavaFix(ctx.getInfo(), ctx.getPath()) { - private boolean wasRun; - @Override protected String getText() { - return "Fix"; - } - @Override protected void performRewrite(TransformationContext ctx) throws Exception { - if (wasRun) return ; - ctx.getWorkingCopy().rewrite(ctx.getPath().getLeaf(), ctx.getWorkingCopy().getTreeMaker().setLabel(ctx.getPath().getLeaf(), "Nue")); - wasRun = true; - } - }.toEditorFix(); - return ErrorDescriptionFactory.forTree(ctx, ctx.getPath(), "Test", f); - } - } - - public void testSourcePathReady() throws Exception { - HintTest.create() - .input("test/Test1.java", - "package test;\n" + - "public class Test1 {\n" + - " private final Test2 test2 = null;\n" + - "}\n") - .input("test/Test2.java", - "package test;\n" + - "public class Test2 {\n" + - " private final Test1 test1 = null;\n" + - "}\n") - .runGlobal(NoOp.class) - .assertWarnings(); - } - - @Hint(displayName="noOp", description="noOp", category="test") - public static final class NoOp { - @TriggerTreeKind(Kind.CLASS) - public static ErrorDescription hint(HintContext ctx) { - return null; - } - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/nbproject/build-impl.xml --- a/sandbox/java.hints/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/nbproject/genfiles.properties --- a/sandbox/java.hints/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -build.xml.data.CRC32=85cca5f7 -build.xml.script.CRC32=25a1521a -build.xml.stylesheet.CRC32=eaf9f76a@2.58 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=85cca5f7 -nbproject/build-impl.xml.script.CRC32=82e0fe0b -nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.58 -nbproject/platform.xml.data.CRC32=85cca5f7 -nbproject/platform.xml.script.CRC32=6dcbd131 -nbproject/platform.xml.stylesheet.CRC32=4e1f53d4@2.70 diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/nbproject/platform.properties --- a/sandbox/java.hints/nbproject/platform.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -cluster.path=\ - ${nbplatform.active.dir}/apisupport:\ - ${nbplatform.active.dir}/cnd:\ - ${nbplatform.active.dir}/dlight:\ - ${nbplatform.active.dir}/enterprise:\ - ${nbplatform.active.dir}/extide:\ - ${nbplatform.active.dir}/extra:\ - ${nbplatform.active.dir}/harness:\ - ${nbplatform.active.dir}/ide:\ - ${nbplatform.active.dir}/java:\ - ${nbplatform.active.dir}/nb:\ - ${nbplatform.active.dir}/platform:\ - ${nbplatform.active.dir}/profiler:\ - ${nbplatform.active.dir}/webcommon:\ - ${nbplatform.active.dir}/websvccommon:\ - ../remoting/common/build/cluster -extcluster.../remoting/common/build/cluster.javadoc= -extcluster.../remoting/common/build/cluster.sources= -nbplatform.active=default diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/nbproject/platform.xml --- a/sandbox/java.hints/nbproject/platform.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/nbproject/project.properties --- a/sandbox/java.hints/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -modules=\ - ${project.org.netbeans.spi.java.hints}:\ - ${project.org.netbeans.modules.java.hints.test}:\ - ${project.org.netbeans.modules.jackpot30.hintsimpl} -project.org.netbeans.modules.jackpot30.hintsimpl=hintsimpl -project.org.netbeans.modules.java.hints.test=java.hints.test -project.org.netbeans.spi.java.hints=spi.java.hints diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/nbproject/project.xml --- a/sandbox/java.hints/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ - - - org.netbeans.modules.apisupport.project.suite - - - java.hints - - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/apichanges.xml --- a/sandbox/java.hints/spi.java.hints/apichanges.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,139 +0,0 @@ - - - - - - Java Hints SPI - - - - - Defining system filesystem folder for per-project Java hints customizers - - - - - -

- Defining Project/hints/java-based folder, where provider for - hints customizers for Java-based projects should be stored. -

- - - - - - Added support for integer options. Hints can be declared to appear only in inspect & transform - - - - - -

- Added declarative support for integer options. @IntegerOption can - be used with option name field, similar to @BooleanOption. -

-

- An option was added to Hint.Options, so that hint can declare - to be only shown in Inspect & transform dialog. Useful for computation-intensive - hints, which should only run on demand. -

- - - - - - - - - Introducing ErrorDescriptionFactory.forSpan. - - - - - -

- Added ErrorDescriptionFactory.forSpan to create the correct - Java-enhanced ErrorDescription from a span. -

- - - - - - - Added support for using jackpot patterns from other modules (e.g. refactoring). - - - - - -

- Added support for using jackpot patterns from other modules (e.g. refactoring). -

- - - - - - - - Change History for the Java Hints SPI - - - -

- Overview -

-

Introduction

-

This document lists changes made to the Java Hints SPI.

- - -
- - -
-

@FOOTER@

- - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/arch.xml --- a/sandbox/java.hints/spi.java.hints/arch.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1115 +0,0 @@ - - -]> - - - - &api-questions; - - - - -

- - SPI to create custom Java hints, including code smell warnings, productivity tips, etc. - Please see the Use Cases section for a guide on how to use this SPI. - -

- - - - - - -

- XXX no answer for arch-quality -

- - - - - - -

- XXX no answer for arch-time -

- - - - - - -

- - Simple way to create a new Java hint is as follows: -

    -
  • Create a new class, annotate it with the @Hint - annotation to it.
    • -
  • Create a public static ErrorDescription hint(HintContext ctx) {} method in the - class. Annotate the method either with the @TriggerPattern - annotation (strongly recommended), or with the @TriggerTreeKind. - This method will be called when for parts of the code that match the given pattern, of for trees of the specified kinds.
    • -
  • Perform whatever checks necessary to find out whether a warning should be produced at the given place, and produce the ErrorDescription if needed.
    • -
-
- Tips: -
    -
  • Always use the java.hints' ErrorDescriptionFactory to produce the resulting ErrorDescription.
    • -
  • Never try to produce a custom suppress warnings "fix". Specify suppress warnings keys in the @Hint annotation.
    • -
  • If an automated transformation is to be prodived from your hint, subclass JavaFix and - use its toEditorFix() method to get the Fix, if the transformation is going to be used inside Inspect&Transform. -
    • -
  • The name of the method is arbitrary, one hint can consist of more that one "triggered" method.
    • -
- - - For simple hints, it is possible to annotate the hint method with the @Hint annotation. - The hint then consists of this sole method. Any number of such hints may be created in a single class. - - - Creating automated tests for the hints is simple: create a test class, and use - HintTest - to setup the test, run the hint and verify that its outcomes are correct. - The tests automatically run with test branding, so create Bundle_test.properties, and add - bundle keys into it for ErrorDescription and Fix display names, to isolate the test from changes in the production - Bundle.properties. - - - To add a simple boolean option to your hint, use @BooleanOption. - -

- - - - - - -

- XXX no answer for arch-what -

- - - - - - - - - - - - - -

- XXX no answer for compat-deprecation -

- - - - - - -

- XXX no answer for compat-i18n -

- - - - - - -

- XXX no answer for compat-standards -

- - - - - - -

- XXX no answer for compat-version -

- - - - - - -

- XXX no answer for dep-jre -

- - - - - - -

- XXX no answer for dep-jrejdk -

- - - - - - - - - - - - - -

- XXX no answer for dep-non-nb -

- - - - - - -

- XXX no answer for dep-platform -

- - - - - - -

- XXX no answer for deploy-dependencies -

- - - - - - -

- XXX no answer for deploy-jar -

- - - - - - -

- XXX no answer for deploy-nbm -

- - - - - - -

- XXX no answer for deploy-packages -

- - - - - - -

- XXX no answer for deploy-shared -

- - - - - - -

- XXX no answer for exec-ant-tasks -

- - - - - - -

- XXX no answer for exec-classloader -

- - - - - - -

- XXX no answer for exec-component -

- - - - - - -

- XXX no answer for exec-introspection -

- - - - - - -

- XXX no answer for exec-privateaccess -

- - - - - - -

- XXX no answer for exec-process -

- - - - - - -

- XXX no answer for exec-property -

- - - - - - -

- XXX no answer for exec-reflection -

- - - - - - -

- XXX no answer for exec-threading -

- - - - - - -

- XXX no answer for format-clipboard -

- - - - - - -

- XXX no answer for format-dnd -

- - - - - - -

- XXX no answer for format-types -

- - - - - - -

- XXX no answer for lookup-lookup -

- - - - - - -

- XXX no answer for lookup-register -

- - - - - - -

- XXX no answer for lookup-remove -

- - - - - - -

- XXX no answer for perf-exit -

- - - - - - -

- XXX no answer for perf-huge_dialogs -

- - - - - - -

- XXX no answer for perf-limit -

- - - - - - -

- XXX no answer for perf-mem -

- - - - - - -

- XXX no answer for perf-menus -

- - - - - - -

- XXX no answer for perf-progress -

- - - - - - -

- XXX no answer for perf-scale -

- - - - - - -

- XXX no answer for perf-spi -

- - - - - - -

- XXX no answer for perf-startup -

- - - - - - -

- XXX no answer for perf-wakeup -

- - - - - - -

- XXX no answer for resources-file -

- - - - - - -

- XXX no answer for resources-layer -

- - - - - - -

- XXX no answer for resources-mask -

- - - - - - -

- XXX no answer for resources-preferences -

- - - - - - -

- XXX no answer for resources-read -

- - - - - - -

- XXX no answer for security-grant -

- - - - - - -

- XXX no answer for security-policy -

- - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/build.xml --- a/sandbox/java.hints/spi.java.hints/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - - - - - Builds, tests, and runs the project org.netbeans.spi.java.hints. - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/manifest.mf --- a/sandbox/java.hints/spi.java.hints/manifest.mf Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -Manifest-Version: 1.0 -OpenIDE-Module: org.netbeans.spi.java.hints -OpenIDE-Module-Implementation-Version: 11 -OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/hints/spiimpl/Bundle.properties - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/nbproject/build-impl.xml --- a/sandbox/java.hints/spi.java.hints/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ - - - - - - - - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/nbproject/genfiles.properties --- a/sandbox/java.hints/spi.java.hints/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -build.xml.data.CRC32=1b4fb019 -build.xml.script.CRC32=caab83d9 -build.xml.stylesheet.CRC32=a56c6a5b@2.70 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=1b4fb019 -nbproject/build-impl.xml.script.CRC32=7438bc77 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.70 diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/nbproject/org-netbeans-spi-java-hints.sig --- a/sandbox/java.hints/spi.java.hints/nbproject/org-netbeans-spi-java-hints.sig Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,276 +0,0 @@ -#Signature file v4.1 -#Version 1.10.1 - -CLSS public abstract interface java.io.Serializable - -CLSS public abstract interface java.lang.Comparable<%0 extends java.lang.Object> -meth public abstract int compareTo({java.lang.Comparable%0}) - -CLSS public abstract java.lang.Enum<%0 extends java.lang.Enum<{java.lang.Enum%0}>> -cons protected init(java.lang.String,int) -intf java.io.Serializable -intf java.lang.Comparable<{java.lang.Enum%0}> -meth protected final java.lang.Object clone() throws java.lang.CloneNotSupportedException -meth protected final void finalize() -meth public final boolean equals(java.lang.Object) -meth public final int compareTo({java.lang.Enum%0}) -meth public final int hashCode() -meth public final int ordinal() -meth public final java.lang.Class<{java.lang.Enum%0}> getDeclaringClass() -meth public final java.lang.String name() -meth public java.lang.String toString() -meth public static <%0 extends java.lang.Enum<{%%0}>> {%%0} valueOf(java.lang.Class<{%%0}>,java.lang.String) -supr java.lang.Object -hfds name,ordinal - -CLSS public java.lang.Object -cons public init() -meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException -meth protected void finalize() throws java.lang.Throwable -meth public boolean equals(java.lang.Object) -meth public final java.lang.Class getClass() -meth public final void notify() -meth public final void notifyAll() -meth public final void wait() throws java.lang.InterruptedException -meth public final void wait(long) throws java.lang.InterruptedException -meth public final void wait(long,int) throws java.lang.InterruptedException -meth public int hashCode() -meth public java.lang.String toString() - -CLSS public abstract interface java.lang.annotation.Annotation -meth public abstract boolean equals(java.lang.Object) -meth public abstract int hashCode() -meth public abstract java.lang.Class annotationType() -meth public abstract java.lang.String toString() - -CLSS public abstract interface !annotation java.lang.annotation.Documented - anno 0 java.lang.annotation.Documented() - anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) - anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE]) -intf java.lang.annotation.Annotation - -CLSS public abstract interface !annotation java.lang.annotation.Retention - anno 0 java.lang.annotation.Documented() - anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) - anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE]) -intf java.lang.annotation.Annotation -meth public abstract java.lang.annotation.RetentionPolicy value() - -CLSS public abstract interface !annotation java.lang.annotation.Target - anno 0 java.lang.annotation.Documented() - anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) - anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE]) -intf java.lang.annotation.Annotation -meth public abstract java.lang.annotation.ElementType[] value() - -CLSS public abstract interface !annotation org.netbeans.spi.java.hints.BooleanOption - anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE) - anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[FIELD]) -intf java.lang.annotation.Annotation -meth public abstract boolean defaultValue() -meth public abstract java.lang.String displayName() -meth public abstract java.lang.String tooltip() - -CLSS public abstract interface !annotation org.netbeans.spi.java.hints.ConstraintVariableType - anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[]) -intf java.lang.annotation.Annotation -meth public abstract java.lang.String type() -meth public abstract java.lang.String variable() - -CLSS public abstract interface org.netbeans.spi.java.hints.CustomizerProvider -meth public abstract javax.swing.JComponent getCustomizer(java.util.prefs.Preferences) - anno 0 org.netbeans.api.annotations.common.NonNull() - anno 1 org.netbeans.api.annotations.common.NonNull() - -CLSS public org.netbeans.spi.java.hints.ErrorDescriptionFactory -meth public !varargs static org.netbeans.spi.editor.hints.ErrorDescription forName(org.netbeans.spi.java.hints.HintContext,com.sun.source.tree.Tree,java.lang.String,org.netbeans.spi.editor.hints.Fix[]) -meth public !varargs static org.netbeans.spi.editor.hints.ErrorDescription forName(org.netbeans.spi.java.hints.HintContext,com.sun.source.util.TreePath,java.lang.String,org.netbeans.spi.editor.hints.Fix[]) -meth public !varargs static org.netbeans.spi.editor.hints.ErrorDescription forSpan(org.netbeans.spi.java.hints.HintContext,int,int,java.lang.String,org.netbeans.spi.editor.hints.Fix[]) -meth public !varargs static org.netbeans.spi.editor.hints.ErrorDescription forTree(org.netbeans.spi.java.hints.HintContext,com.sun.source.tree.Tree,java.lang.String,org.netbeans.spi.editor.hints.Fix[]) -meth public !varargs static org.netbeans.spi.editor.hints.ErrorDescription forTree(org.netbeans.spi.java.hints.HintContext,com.sun.source.util.TreePath,java.lang.String,org.netbeans.spi.editor.hints.Fix[]) -supr java.lang.Object -hfds DECLARATION -hcls DisableConfigure,FixImpl,InspectFix,TopLevelConfigureFix - -CLSS public abstract interface !annotation org.netbeans.spi.java.hints.Hint - anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE) - anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE, METHOD]) -innr public final static !enum Kind -innr public final static !enum Options -intf java.lang.annotation.Annotation -meth public abstract !hasdefault boolean enabled() -meth public abstract !hasdefault java.lang.Class customizerProvider() -meth public abstract !hasdefault java.lang.String id() -meth public abstract !hasdefault java.lang.String[] suppressWarnings() -meth public abstract !hasdefault org.netbeans.spi.editor.hints.Severity severity() -meth public abstract !hasdefault org.netbeans.spi.java.hints.Hint$Kind hintKind() -meth public abstract !hasdefault org.netbeans.spi.java.hints.Hint$Options[] options() -meth public abstract java.lang.String category() -meth public abstract java.lang.String description() -meth public abstract java.lang.String displayName() - -CLSS public final static !enum org.netbeans.spi.java.hints.Hint$Kind - outer org.netbeans.spi.java.hints.Hint -fld public final static org.netbeans.spi.java.hints.Hint$Kind ACTION -fld public final static org.netbeans.spi.java.hints.Hint$Kind INSPECTION -meth public static org.netbeans.spi.java.hints.Hint$Kind valueOf(java.lang.String) -meth public static org.netbeans.spi.java.hints.Hint$Kind[] values() -supr java.lang.Enum - -CLSS public final static !enum org.netbeans.spi.java.hints.Hint$Options - outer org.netbeans.spi.java.hints.Hint -fld public final static org.netbeans.spi.java.hints.Hint$Options NO_BATCH -fld public final static org.netbeans.spi.java.hints.Hint$Options QUERY -meth public static org.netbeans.spi.java.hints.Hint$Options valueOf(java.lang.String) -meth public static org.netbeans.spi.java.hints.Hint$Options[] values() -supr java.lang.Enum - -CLSS public org.netbeans.spi.java.hints.HintContext -innr public final static !enum MessageKind -meth public boolean isBulkMode() -meth public boolean isCanceled() -meth public com.sun.source.util.TreePath getPath() -meth public int getCaretLocation() -meth public java.util.Map getVariables() -meth public java.util.Map getVariableNames() -meth public java.util.Map> getMultiVariables() -meth public java.util.Map getConstraints() -meth public java.util.prefs.Preferences getPreferences() -meth public org.netbeans.api.java.source.CompilationInfo getInfo() -meth public org.netbeans.spi.editor.hints.Severity getSeverity() -meth public void reportMessage(org.netbeans.spi.java.hints.HintContext$MessageKind,java.lang.String) -supr java.lang.Object -hfds bulkMode,cancel,caret,constraints,info,messages,metadata,multiVariables,path,preferences,severity,variableNames,variables - -CLSS public final static !enum org.netbeans.spi.java.hints.HintContext$MessageKind - outer org.netbeans.spi.java.hints.HintContext -fld public final static org.netbeans.spi.java.hints.HintContext$MessageKind ERROR -fld public final static org.netbeans.spi.java.hints.HintContext$MessageKind WARNING -meth public static org.netbeans.spi.java.hints.HintContext$MessageKind valueOf(java.lang.String) -meth public static org.netbeans.spi.java.hints.HintContext$MessageKind[] values() -supr java.lang.Enum - -CLSS public final !enum org.netbeans.spi.java.hints.HintSeverity -fld public final static org.netbeans.spi.java.hints.HintSeverity CURRENT_LINE_WARNING -fld public final static org.netbeans.spi.java.hints.HintSeverity ERROR -fld public final static org.netbeans.spi.java.hints.HintSeverity WARNING -meth public org.netbeans.spi.editor.hints.Severity toEditorSeverity() -meth public static org.netbeans.spi.java.hints.HintSeverity valueOf(java.lang.String) -meth public static org.netbeans.spi.java.hints.HintSeverity[] values() -supr java.lang.Enum - -CLSS public abstract org.netbeans.spi.java.hints.JavaFix -cons protected init(org.netbeans.api.java.source.CompilationInfo,com.sun.source.util.TreePath) - anno 1 org.netbeans.api.annotations.common.NonNull() - anno 2 org.netbeans.api.annotations.common.NonNull() -cons protected init(org.netbeans.api.java.source.TreePathHandle) - anno 1 org.netbeans.api.annotations.common.NonNull() -innr public final static TransformationContext -meth protected abstract java.lang.String getText() - anno 0 org.netbeans.api.annotations.common.NonNull() -meth protected abstract void performRewrite(org.netbeans.spi.java.hints.JavaFix$TransformationContext) throws java.lang.Exception - anno 1 org.netbeans.api.annotations.common.NonNull() -meth public final org.netbeans.spi.editor.hints.Fix toEditorFix() -supr java.lang.Object -hfds LOG,handle,options - -CLSS public final static org.netbeans.spi.java.hints.JavaFix$TransformationContext - outer org.netbeans.spi.java.hints.JavaFix -meth public com.sun.source.util.TreePath getPath() - anno 0 org.netbeans.api.annotations.common.NonNull() -meth public java.io.InputStream getResourceContent(org.openide.filesystems.FileObject) throws java.io.IOException - anno 0 org.netbeans.api.annotations.common.NonNull() - anno 1 org.netbeans.api.annotations.common.NonNull() -meth public java.io.OutputStream getResourceOutput(org.openide.filesystems.FileObject) throws java.io.IOException - anno 0 org.netbeans.api.annotations.common.NonNull() - anno 1 org.netbeans.api.annotations.common.NonNull() -meth public org.netbeans.api.java.source.WorkingCopy getWorkingCopy() - anno 0 org.netbeans.api.annotations.common.NonNull() -supr java.lang.Object -hfds canShowUI,fileChanges,path,resourceContentChanges,workingCopy - -CLSS public org.netbeans.spi.java.hints.JavaFixUtilities -cons public init() -meth public static boolean requiresParenthesis(com.sun.source.tree.Tree,com.sun.source.tree.Tree,com.sun.source.tree.Tree) -meth public static org.netbeans.spi.editor.hints.Fix removeFromParent(org.netbeans.spi.java.hints.HintContext,java.lang.String,com.sun.source.util.TreePath) -meth public static org.netbeans.spi.editor.hints.Fix rewriteFix(org.netbeans.spi.java.hints.HintContext,java.lang.String,com.sun.source.util.TreePath,java.lang.String) -supr java.lang.Object -hfds NUMBER_LITERAL_KINDS,OPERATOR_PRIORITIES,SPEC_VERSION -hcls JavaFixRealImpl,MoveFile,RemoveFromParent,ReplaceParameters - -CLSS public org.netbeans.spi.java.hints.MatcherUtilities -cons public init() -meth public static boolean matches(org.netbeans.spi.java.hints.HintContext,com.sun.source.util.TreePath,java.lang.String) - anno 1 org.netbeans.api.annotations.common.NonNull() - anno 2 org.netbeans.api.annotations.common.NonNull() - anno 3 org.netbeans.api.annotations.common.NonNull() -meth public static boolean matches(org.netbeans.spi.java.hints.HintContext,com.sun.source.util.TreePath,java.lang.String,boolean) - anno 1 org.netbeans.api.annotations.common.NonNull() - anno 2 org.netbeans.api.annotations.common.NonNull() - anno 3 org.netbeans.api.annotations.common.NonNull() -meth public static boolean matches(org.netbeans.spi.java.hints.HintContext,com.sun.source.util.TreePath,java.lang.String,java.util.Map,java.util.Map>,java.util.Map) - anno 1 org.netbeans.api.annotations.common.NonNull() - anno 2 org.netbeans.api.annotations.common.NonNull() - anno 3 org.netbeans.api.annotations.common.NonNull() -meth public static boolean matches(org.netbeans.spi.java.hints.HintContext,java.util.Collection,java.lang.String,java.util.Map,java.util.Map>,java.util.Map) - anno 1 org.netbeans.api.annotations.common.NonNull() - anno 2 org.netbeans.api.annotations.common.NonNull() - anno 3 org.netbeans.api.annotations.common.NonNull() -supr java.lang.Object - -CLSS public abstract interface !annotation org.netbeans.spi.java.hints.TriggerPattern - anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE) - anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[METHOD]) -intf java.lang.annotation.Annotation -meth public abstract !hasdefault org.netbeans.spi.java.hints.ConstraintVariableType[] constraints() -meth public abstract java.lang.String value() - -CLSS public abstract interface !annotation org.netbeans.spi.java.hints.TriggerPatterns - anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE) - anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[METHOD]) -intf java.lang.annotation.Annotation -meth public abstract org.netbeans.spi.java.hints.TriggerPattern[] value() - -CLSS public abstract interface !annotation org.netbeans.spi.java.hints.TriggerTreeKind - anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE) - anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[METHOD]) -intf java.lang.annotation.Annotation -meth public abstract com.sun.source.tree.Tree$Kind[] value() - -CLSS public abstract interface !annotation org.netbeans.spi.java.hints.UseOptions - anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE) - anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[METHOD]) -intf java.lang.annotation.Annotation -meth public abstract java.lang.String[] value() - -CLSS public final org.netbeans.spi.java.hints.support.FixFactory -meth public final static org.netbeans.spi.editor.hints.Fix addModifiersFix(org.netbeans.api.java.source.CompilationInfo,com.sun.source.util.TreePath,java.util.Set,java.lang.String) -meth public final static org.netbeans.spi.editor.hints.Fix changeModifiersFix(org.netbeans.api.java.source.CompilationInfo,com.sun.source.util.TreePath,java.util.Set,java.util.Set,java.lang.String) -meth public final static org.netbeans.spi.editor.hints.Fix removeModifiersFix(org.netbeans.api.java.source.CompilationInfo,com.sun.source.util.TreePath,java.util.Set,java.lang.String) -supr java.lang.Object -hcls ChangeModifiersFixImpl - -CLSS public final org.netbeans.spi.java.hints.support.TransformationSupport -innr public abstract interface static Transformer -meth public java.util.Collection processAllProjects() - anno 0 org.netbeans.api.annotations.common.NonNull() -meth public org.netbeans.spi.java.hints.support.TransformationSupport setCancel(java.util.concurrent.atomic.AtomicBoolean) - anno 0 org.netbeans.api.annotations.common.NonNull() - anno 1 org.netbeans.api.annotations.common.NonNull() -meth public static org.netbeans.spi.java.hints.support.TransformationSupport create(java.lang.String) - anno 0 org.netbeans.api.annotations.common.NonNull() - anno 1 org.netbeans.api.annotations.common.NonNull() -meth public static org.netbeans.spi.java.hints.support.TransformationSupport create(java.lang.String,org.netbeans.spi.java.hints.support.TransformationSupport$Transformer) - anno 0 org.netbeans.api.annotations.common.NonNull() - anno 1 org.netbeans.api.annotations.common.NonNull() - anno 2 org.netbeans.api.annotations.common.NonNull() -meth public void transformTreePath(org.netbeans.api.java.source.WorkingCopy,com.sun.source.util.TreePath) - anno 1 org.netbeans.api.annotations.common.NonNull() - anno 2 org.netbeans.api.annotations.common.NonNull() -supr java.lang.Object -hfds cancel,jackpotPattern,transformer - -CLSS public abstract interface static org.netbeans.spi.java.hints.support.TransformationSupport$Transformer - outer org.netbeans.spi.java.hints.support.TransformationSupport -meth public abstract void transform(org.netbeans.api.java.source.WorkingCopy,org.netbeans.api.java.source.matching.Occurrence) - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/nbproject/project.properties --- a/sandbox/java.hints/spi.java.hints/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -is.autoload=true -javac.source=1.7 -javac.compilerargs=-Xlint -Xlint:-serial -spec.version.base=2.0.0 -requires.nb.javac=true -javadoc.arch=${basedir}/arch.xml -javadoc.apichanges=${basedir}/apichanges.xml diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/nbproject/project.xml --- a/sandbox/java.hints/spi.java.hints/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,480 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - org.netbeans.spi.java.hints - - - - org.netbeans.api.annotations.common - - - - 1 - 1.4 - - - - org.netbeans.api.java - - - - 1 - 1.18 - - - - org.netbeans.api.java.classpath - - - - 1 - 1.24 - - - - org.netbeans.api.progress - - - - 1 - 1.16 - - - - org.netbeans.api.progress.nb - - - - 1.45 - - - - org.netbeans.lib.nbjavac - - - - - - - - org.netbeans.libs.javacapi - - - - 8.0 - - - - org.netbeans.libs.javacimpl - - - - 1 - - - - - org.netbeans.libs.lucene - - - - 3 - 3.0 - - - - org.netbeans.modules.code.analysis - - - - 0 - 1.8 - - - - org.netbeans.modules.editor - - - - 3 - 1.53 - - - - org.netbeans.modules.editor.errorstripe.api - - - - 1 - 2.3 - - - - org.netbeans.modules.editor.lib - - - - 3 - 3.1 - - - - org.netbeans.modules.editor.lib2 - - - - 1 - 1.8 - - - - org.netbeans.modules.editor.mimelookup - - - - 1 - 1.15 - - - - org.netbeans.modules.editor.settings - - - - 1 - 1.28 - - - - org.netbeans.modules.editor.util - - - - 1 - 1.33 - - - - org.netbeans.modules.java.lexer - - - - 1 - 1.0 - - - - org.netbeans.modules.java.platform - - - - 1 - 1.16 - - - - org.netbeans.modules.java.project - - - - 1 - 1.41 - - - - org.netbeans.modules.java.source - - - - - - - - org.netbeans.modules.java.source.base - - - - - - - - org.netbeans.modules.lexer - - - - 2 - 1.25 - - - - org.netbeans.modules.options.api - - - - 1 - 1.5 - - - - org.netbeans.modules.options.editor - - - - 1 - 1.28 - - - - org.netbeans.modules.parsing.api - - - - 1 - - - - - org.netbeans.modules.projectapi - - - - 1 - 1.42 - - - - org.netbeans.modules.queries - - - - 1 - 1.18 - - - - org.netbeans.modules.refactoring.api - - - - 1.23 - - - - org.netbeans.spi.editor.hints - - - - 0-1 - 1.22 - - - - org.openide.actions - - - - 6.15 - - - - org.openide.awt - - - - 6.10 - - - - org.openide.dialogs - - - - 7.0 - - - - org.openide.explorer - - - - 6.22 - - - - org.openide.filesystems - - - - 7.19 - - - - org.openide.loaders - - - - - - org.openide.modules - - - - 7.3 - - - - org.openide.nodes - - - - 6.2 - - - - org.openide.text - - - - 6.16 - - - - org.openide.util - - - - 8.32 - - - - org.openide.util.lookup - - - - 8.0 - - - - org.openide.windows - - - - 6.16 - - - - - - unit - - org.netbeans.core - - - - org.netbeans.insane - - - - org.netbeans.libs.freemarker - - - - - org.netbeans.libs.junit4 - - - - org.netbeans.modules.classfile - - - org.netbeans.modules.defaults - - - org.netbeans.modules.editor - - - - org.netbeans.modules.editor.mimelookup - - - - - org.netbeans.modules.editor.settings - - - org.netbeans.modules.editor.settings.storage - - - org.netbeans.modules.editor.util - - - org.netbeans.modules.jackpot30.test.borrowed - - - - org.netbeans.modules.java.editor - - - - - org.netbeans.modules.java.hints - - - - org.netbeans.modules.java.hints.declarative - - - - org.netbeans.modules.java.source - - - - - org.netbeans.modules.masterfs - - - org.netbeans.modules.nbjunit - - - - org.netbeans.modules.parsing.api - - - - - org.netbeans.modules.parsing.nb - - - - org.netbeans.modules.progress.ui - - - org.netbeans.modules.projectapi.nb - - - - org.netbeans.modules.projectui - - - org.openide.util - - - - - org.openide.util.lookup - - - - - - - org.netbeans.spi.java.hints - org.netbeans.spi.java.hints.annotations - org.netbeans.spi.java.hints.matching - org.netbeans.spi.java.hints.support - - - - diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/nbproject/suite.properties --- a/sandbox/java.hints/spi.java.hints/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/Bundle.properties --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 2008-2009 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -LBL_UpdateDependencyQuestion=Update dependency on module {0} to specification version {1}? \ No newline at end of file diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/HintsRunner.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/HintsRunner.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.jackpot.spi; - -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import com.sun.source.util.TreePath; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; -import org.netbeans.api.annotations.common.CheckForNull; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.modules.java.hints.spiimpl.MessageImpl; -import org.netbeans.modules.java.hints.spiimpl.hints.HintsInvoker; -import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings; -import org.netbeans.spi.editor.hints.ErrorDescription; - -/**XXX: probably unused - * - * @author lahvac - */ -public class HintsRunner { - - @CheckForNull - public static Map> computeErrors(CompilationInfo info, Iterable hints, AtomicBoolean cancel) { - return new HintsInvoker(HintsSettings.getSettingsFor(info.getFileObject()), cancel).computeHints(info, new TreePath(info.getCompilationUnit()), hints, new LinkedList()); - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/PatternConvertor.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/PatternConvertor.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,113 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2011 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2011 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.jackpot.spi; - -import org.netbeans.modules.java.hints.providers.spi.HintDescriptionFactory; -import org.netbeans.spi.java.hints.HintContext; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import org.netbeans.api.annotations.common.CheckForNull; -import org.netbeans.api.annotations.common.NonNull; -import org.netbeans.modules.java.hints.providers.spi.HintDescription.Worker; -import org.netbeans.modules.java.hints.providers.spi.Trigger.PatternDescription; -import org.netbeans.spi.java.hints.ErrorDescriptionFactory; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import org.openide.util.Lookup; - -/**XXX: big hack? - * - * @author lahvac - */ -public abstract class PatternConvertor { - - protected abstract @CheckForNull Iterable parseString(@NonNull String code); - - public static @CheckForNull Iterable create(@NonNull String code) { - Collection patterns = new ArrayList(); - - //XXX: - if (code.contains(";;")) { - PatternConvertor c = Lookup.getDefault().lookup(PatternConvertor.class); - - if (c != null) { - return c.parseString(code); - } - - for (String s : code.split(";;")) { - s = s.trim(); - if (s.isEmpty()) { - continue; - } - - patterns.add(s); - } - } else { - patterns.add(code); - } - - Collection result = new ArrayList(patterns.size()); - - for (String pattern : patterns) { - PatternDescription pd = PatternDescription.create(pattern, Collections.emptyMap()); - - HintDescription desc = HintDescriptionFactory.create() - // .setDisplayName("Pattern Matches") - .setTrigger(pd) - .setWorker(new WorkerImpl()) - .produce(); - - result.add(desc); - } - - return result; - } - - private static final class WorkerImpl implements Worker { - - public Collection createErrors(HintContext ctx) { - ErrorDescription ed = ErrorDescriptionFactory.forTree(ctx, ctx.getPath(), "Found pattern occurrence"); - - return Collections.singleton(ed); - } - - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/ProjectDependencyUpgrader.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/jackpot/spi/ProjectDependencyUpgrader.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2010 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.jackpot.spi; - -import org.netbeans.api.project.Project; -import org.openide.DialogDisplayer; -import org.openide.NotifyDescriptor; -import org.openide.filesystems.FileObject; -import org.openide.modules.SpecificationVersion; - -/** - * - * @author lahvac - */ -public abstract class ProjectDependencyUpgrader { - - public abstract boolean ensureDependency(Project p, FileObject dep, SpecificationVersion spec, boolean canShowUI); - public abstract boolean ensureDependency(Project p, String specification, boolean b); - - protected final boolean showDependencyUpgradeDialog(Project p, String dep, SpecificationVersion currentDependency, SpecificationVersion spec, boolean newDepenency, boolean canShowUI) { - if (!canShowUI) return true; - - NotifyDescriptor nd = new NotifyDescriptor.Confirmation("New version: " + spec, "Update spec version.", NotifyDescriptor.YES_NO_OPTION); - - return DialogDisplayer.getDefault().notify(nd) == NotifyDescriptor.YES_OPTION; - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/code/CodeHintProviderImpl.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/code/CodeHintProviderImpl.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,475 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.providers.code; - -import com.sun.source.tree.Tree.Kind; -import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicReference; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.prefs.Preferences; -import javax.swing.JComponent; -import javax.swing.JPanel; -import org.netbeans.modules.java.hints.providers.code.FSWrapper.ClassWrapper; -import org.netbeans.modules.java.hints.providers.code.FSWrapper.FieldWrapper; -import org.netbeans.modules.java.hints.providers.code.FSWrapper.MethodWrapper; -import org.netbeans.modules.java.hints.providers.code.ReflectiveCustomizerProvider.OptionDescriptor; -import org.netbeans.spi.java.hints.CustomizerProvider; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import org.netbeans.modules.java.hints.providers.spi.HintDescription.Worker; -import org.netbeans.modules.java.hints.providers.spi.HintDescriptionFactory; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata.Options; -import org.netbeans.modules.java.hints.providers.spi.HintProvider; -import org.netbeans.modules.java.hints.providers.spi.Trigger.DecisionTrigger; -import org.netbeans.modules.java.hints.providers.spi.Trigger.Kinds; -import org.netbeans.modules.java.hints.providers.spi.Trigger.PatternDescription; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.editor.hints.Severity; -import org.netbeans.spi.java.hints.BooleanOption; -import org.netbeans.spi.java.hints.ConstraintVariableType; -import org.netbeans.spi.java.hints.Hint; -import org.netbeans.spi.java.hints.IntegerOption; -import org.netbeans.spi.java.hints.TriggerDecision; -import org.netbeans.spi.java.hints.TriggerPattern; -import org.netbeans.spi.java.hints.TriggerPatterns; -import org.netbeans.spi.java.hints.TriggerTreeKind; -import org.netbeans.spi.java.hints.UseOptions; -import org.openide.util.Exceptions; -import org.openide.util.Lookup; -import org.openide.util.NbCollections; -import org.openide.util.lookup.ServiceProvider; - -/** - * - * @author lahvac - */ -@ServiceProvider(service=HintProvider.class) -public class CodeHintProviderImpl implements HintProvider { - - private static final Logger LOG = Logger.getLogger(WorkerImpl.class.getName()); - - public Map> computeHints() { - return computeHints(findLoader(), "META-INF/nb-hints/hints"); - } - - private Map> computeHints(ClassLoader l, String path) { - Map> result = new HashMap>(); - - for (ClassWrapper c : FSWrapper.listClasses()) { - try { - processClass(c, result); - } catch (ThreadDeath td) { - throw td; - } catch (Throwable t) { - Exceptions.printStackTrace(t); - } - } - - return result; - } - - static ClassLoader findLoader() { - ClassLoader l = Lookup.getDefault().lookup(ClassLoader.class); - - if (l == null) { - return CodeHintProviderImpl.class.getClassLoader(); - } - - return l; - } - - public static void processClass(ClassWrapper clazz, Map> result) throws SecurityException { - Hint metadata = clazz.getAnnotation(Hint.class); - HintMetadata hm; - - if (metadata != null) { - String id = metadata.id(); - - if (id == null || id.length() == 0) { - id = clazz.getName(); - } - hm = fromAnnotation(id, clazz, null, metadata); - } else { - hm = null; - } - - for (MethodWrapper m : clazz.getMethods()) { - Hint localMetadataAnnotation = m.getAnnotation(Hint.class); - HintMetadata localMetadata; - - if (localMetadataAnnotation != null) { - String localID = localMetadataAnnotation.id(); - - if (localID == null || localID.length() == 0) { - localID = clazz.getName() + "." + m.getName(); - } - - localMetadata = fromAnnotation(localID, clazz, m, localMetadataAnnotation); - } else { - localMetadata = hm; - } - - if (localMetadata != null) { - processMethod(result, m, localMetadata); - } - } - } - - private static HintMetadata fromAnnotation(String id, ClassWrapper clazz, MethodWrapper method, Hint metadata) { - HintMetadata hm = HintMetadata.Builder.create(id) - .setDescription(metadata.displayName(), metadata.description()) - .setCategory(metadata.category()) - .setEnabled(metadata.enabled()) - .setSeverity(metadata.severity()) - .setKind(metadata.hintKind()) - .setCustomizerProvider(createCustomizerProvider(clazz, method, id, metadata)) - .addSuppressWarnings(metadata.suppressWarnings()) - .addOptions(Options.fromHintOptions(metadata.options()).toArray(new Options[0])) - .build(); - return hm; - } - - private static CustomizerProvider createCustomizerProvider(ClassWrapper clazz, MethodWrapper method, String id, Hint hint) { - Class customizerClass = hint.customizerProvider(); - - if (customizerClass != CustomizerProvider.class) { - return new DelegatingCustomizerProvider(customizerClass); - } - - Set allowedOptions = null; - - if (method != null) { - UseOptions useOptions = method.getAnnotation(UseOptions.class); - - if (useOptions == null) return null; - - allowedOptions = new HashSet(Arrays.asList(useOptions.value())); - } - - List declarativeOptions = new ArrayList(); - - for (FieldWrapper fw : clazz.getFields()) { - BooleanOption option = fw.getAnnotation(BooleanOption.class); - IntegerOption iOption = fw.getAnnotation(IntegerOption.class); - - String key = fw.getConstantValue(); - - if (key == null) continue; - if (allowedOptions != null && !allowedOptions.contains(key)) continue; - - Object defValue; - String displayName; - String tooltip; - if (option != null) { - defValue = option.defaultValue(); - displayName = option.displayName(); - tooltip = option.tooltip(); - } else if (iOption != null) { - defValue = iOption.defaultValue(); - displayName = iOption.displayName(); - tooltip = iOption.tooltip(); - } else { - return null; - } - - declarativeOptions.add( - new OptionDescriptor( - key, - defValue, - displayName, - tooltip, - option != null ? option : iOption) - ); - } - - return !declarativeOptions.isEmpty() ? new ReflectiveCustomizerProvider(clazz.getName(), id, declarativeOptions) : null; - } - - static void processMethod(Map> hints, MethodWrapper m, HintMetadata metadata) { - //XXX: combinations of TriggerTreeKind and TriggerPattern? - processTreeKindHint(hints, m, metadata); - processPatternHint(hints, m, metadata); - processDecisionHint(hints, m, metadata); - } - - private static void processTreeKindHint(Map> hints, MethodWrapper m, HintMetadata metadata) { - TriggerTreeKind kindTrigger = m.getAnnotation(TriggerTreeKind.class); - - if (kindTrigger == null) { - return ; - } - - Worker w = new WorkerImpl(m.getClazz().getName(), m.getName()); - - Set kinds = EnumSet.noneOf(Kind.class); - - kinds.addAll(Arrays.asList(kindTrigger.value())); - - addHint(hints, metadata, HintDescriptionFactory.create() - .setTrigger(new Kinds(kinds)) - .setWorker(w) - .setMetadata(metadata) - .produce()); - } - - private static void processPatternHint(Map> hints, MethodWrapper m, HintMetadata metadata) { - TriggerPattern patternTrigger = m.getAnnotation(TriggerPattern.class); - - if (patternTrigger != null) { - processPatternHint(hints, patternTrigger, m, metadata); - return ; - } - - TriggerPatterns patternTriggers = m.getAnnotation(TriggerPatterns.class); - - if (patternTriggers != null) { - for (TriggerPattern pattern : patternTriggers.value()) { - processPatternHint(hints, pattern, m, metadata); - } - return ; - } - } - - private static void processPatternHint(Map> hints, TriggerPattern patternTrigger, MethodWrapper m, HintMetadata metadata) { - String pattern = patternTrigger.value(); - Map constraints = new HashMap(); - - for (ConstraintVariableType c : patternTrigger.constraints()) { - constraints.put(c.variable(), c.type()); - } - - PatternDescription pd = PatternDescription.create(pattern, constraints); - - addHint(hints, metadata, HintDescriptionFactory.create() - .setTrigger(pd) - .setWorker(new WorkerImpl(m.getClazz().getName(), m.getName())) - .setMetadata(metadata) - .produce()); - } - - private static void processDecisionHint(Map> hints, MethodWrapper m, HintMetadata metadata) { - TriggerDecision decisionTrigger = m.getAnnotation(TriggerDecision.class); - - if (decisionTrigger == null) { - return ; - } - - Worker w = new WorkerImpl(m.getClazz().getName(), m.getName()); - - addHint(hints, metadata, HintDescriptionFactory.create() - .setTrigger(new DecisionTrigger(decisionTrigger.value())) - .setWorker(w) - .setMetadata(metadata) - .produce()); - } - - private static void addHint(Map> hints, HintMetadata metadata, HintDescription hint) { - Collection list = hints.get(metadata); - - if (list == null) { - hints.put(metadata, list = new LinkedList()); - } - - list.add(hint); - } - - //accessed by tests: - static final class WorkerImpl implements Worker { - - private final String className; - private final String methodName; - - public WorkerImpl(String className, String methodName) { - this.className = className; - this.methodName = methodName; - } - - private final AtomicReference methodRef = new AtomicReference(); - - public Collection createErrors(org.netbeans.spi.java.hints.HintContext ctx) { - try { - Method method = methodRef.get(); - - if (method == null) { - methodRef.set(method = getMethod()); - } - - Object result = method.invoke(null, ctx); - - if (result == null) { - return null; - } - - if (result instanceof Iterable) { - List out = new LinkedList(); - - for (ErrorDescription ed : NbCollections.iterable(NbCollections.checkedIteratorByFilter(((Iterable) result).iterator(), ErrorDescription.class, false))) { - out.add(ed); - } - - return out; - } - - if (result instanceof ErrorDescription) { - return Collections.singletonList((ErrorDescription) result); - } - - //XXX: log if result was ignored... - } catch (IllegalAccessException ex) { - Exceptions.printStackTrace(ex); - } catch (IllegalArgumentException ex) { - Exceptions.printStackTrace(ex); - } catch (ClassNotFoundException ex) { - Exceptions.printStackTrace(ex); - } catch (NoSuchMethodException ex) { - Exceptions.printStackTrace(ex); - } catch (InvocationTargetException ex) { - LOG.log(Level.INFO, className + "." + methodName, ex); - //so that the exceptions are categorized better: - Exceptions.printStackTrace(ex.getCause()); - } - - return null; - } - - //used by tests: - Method getMethod() throws NoSuchMethodException, ClassNotFoundException { - return FSWrapper.resolveMethod(className, methodName); - } - - } - - private static final class EmptyHintMetadataDescription implements Hint { - - public String id() { - return ""; - } - - public String category() { - return "general"; - } - - public boolean enabled() { - return true; - } - - public Severity severity() { - return Severity.VERIFIER; - } - - private static final String[] EMPTY_SW = new String[0]; - - public String[] suppressWarnings() { - return EMPTY_SW; - } - - public Class annotationType() { - return Hint.class; - } - - public Class customizerProvider() { - return CustomizerProvider.class; - } - - public Kind hintKind() { - return Kind.INSPECTION; - } - - private static final Options[] EMPTY_OPTIONS = new Options[0]; - - public Options[] options() { - return EMPTY_OPTIONS; - } - - @Override public String displayName() { - return ""; - } - - @Override public String description() { - return ""; - } - - } - - private static final class DelegatingCustomizerProvider implements CustomizerProvider { - - private final Class component; - - public DelegatingCustomizerProvider(Class component) { - this.component = component; - } - - @Override - public JComponent getCustomizer(Preferences prefs) { - try { - return component.newInstance().getCustomizer(prefs); - } catch (SecurityException ex) { - Exceptions.printStackTrace(ex); - } catch (InstantiationException ex) { - Exceptions.printStackTrace(ex); - } catch (IllegalAccessException ex) { - Exceptions.printStackTrace(ex); - } catch (IllegalArgumentException ex) { - Exceptions.printStackTrace(ex); - } - - return new JPanel(); - } - - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/code/FSWrapper.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/code/FSWrapper.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,319 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010-2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2010-2011 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.providers.code; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Array; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.netbeans.spi.java.hints.HintContext; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; -import org.openide.util.Exceptions; - -/** - * - * @author lahvac - */ -public class FSWrapper { - - public static Iterable listClasses() { - ClassLoader loader = FSWrapper.class.getClassLoader(); - - if (loader == null) { - loader = ClassLoader.getSystemClassLoader(); - } - - List result = new LinkedList(); - FileObject main = FileUtil.getConfigFile("org-netbeans-modules-java-hints/code-hints/"); - - if (main != null) { - for (FileObject c : main.getChildren()) { - result.add(new ClassWrapper(loader, c)); - } - } - - return result; - } - - public static Method resolveMethod(String className, String methodName) throws NoSuchMethodException, ClassNotFoundException { - Class clazz = CodeHintProviderImpl.findLoader().loadClass(className); - - return clazz.getDeclaredMethod(methodName, HintContext.class); - } - - public static class AnnotatableWrapper { - protected final ClassLoader loader; - protected final FileObject folder; - protected AnnotatableWrapper(ClassLoader loader, FileObject folder) { - this.loader = loader; - this.folder = folder; - } - - private final Map, Annotation> annotations = new HashMap, Annotation>(); - - public synchronized T getAnnotation(Class annotationClass) { - if (!this.annotations.containsKey(annotationClass)) { - FileObject f = folder.getFileObject(annotationClass.getName().replace('.', '-') + ".annotation"); - T result = null; - - if (f != null) { - try { - Annotation a = loadAnnotation(loader, f); - - result = annotationClass.cast(a); - } catch (ClassNotFoundException ex) { - Exceptions.printStackTrace(ex); - } - } - - this.annotations.put(annotationClass, result); - } - - return annotationClass.cast(this.annotations.get(annotationClass)); - } - } - - public static class ClassWrapper extends AnnotatableWrapper { - private final String className; - public ClassWrapper(ClassLoader loader, FileObject folder) { - super(loader, folder); - className = folder.getName().replace('-', '.'); - } - - private Iterable methods; - - public synchronized Iterable getMethods() { - if (this.methods == null) { - List methods = new LinkedList(); - - for (FileObject c : folder.getChildren()) { - if (c.getExt().equals("method")) { - methods.add(new MethodWrapper(loader, c, this)); - } - } - - this.methods = methods; - } - - return this.methods; - } - - private Iterable fields; - - public synchronized Iterable getFields() { - if (this.fields == null) { - List fields = new LinkedList(); - - for (FileObject c : folder.getChildren()) { - if (c.getExt().equals("field")) { - fields.add(new FieldWrapper(loader, c, this)); - } - } - - this.fields = fields; - } - - return this.fields; - } - - public String getName() { - return className; - } - - private Class clazz; - public synchronized Class getDeclaredClass() { - if (clazz != null) { - return clazz; - } - - try { - return this.clazz = loader.loadClass(className); - } catch (ClassNotFoundException ex) { - Exceptions.printStackTrace(ex); - } - - return null; //XXX - } - } - - public static class MethodWrapper extends AnnotatableWrapper { - private final ClassWrapper clazz; - public MethodWrapper(ClassLoader loader, FileObject folder, ClassWrapper clazz) { - super(loader, folder); - this.clazz = clazz; - } - - ClassWrapper getClazz() { - return clazz; - } - - String getName() { - return folder.getName(); - } - } - - public static class FieldWrapper extends AnnotatableWrapper { - private final ClassWrapper clazz; - public FieldWrapper(ClassLoader loader, FileObject folder, ClassWrapper clazz) { - super(loader, folder); - this.clazz = clazz; - } - - ClassWrapper getClazz() { - return clazz; - } - - String getName() { - return folder.getName(); - } - - String getConstantValue() { - Object constantValue = folder.getAttribute("constantValue"); - - if (constantValue instanceof String) { - return (String) constantValue; - } - - return null; - } - } - - private static final Object MARKER = new Object(); - - private static Object computeAttributeValue(ClassLoader loader, FileObject folder, String attributeName, Class returnType, Object defaulValue) throws ClassNotFoundException { - Object result = folder.getAttribute(attributeName); - - if (result == null) { - FileObject embedded = folder.getFileObject(attributeName); - - if (embedded == null) { - result = defaulValue; - } else { - if (returnType.isArray()) { - List items = new LinkedList(); - int c = 0; - - while (true) { - Object val = computeAttributeValue(loader, embedded, "item" + c, returnType.getComponentType(), MARKER); - - if (val == MARKER) { - break; - } - - items.add(val); - c++; - } - - Object res = Array.newInstance(returnType.getComponentType(), items.size()); - int ci = 0; - - for (Object i : items) { - Array.set(res, ci++, i); - } - - result = res; - } else if (returnType.isAnnotation()) { - result = loadAnnotation(loader, embedded.getChildren()[0]); - } - } - } else { - if (returnType.isEnum()) { - String fqn = (String) result; - int lastDot = fqn.lastIndexOf('.'); - Class enumClass = (Class) loader.loadClass(fqn.substring(0, lastDot)); - - result = Enum.valueOf(enumClass, fqn.substring(lastDot + 1)); - } else if (returnType == Class.class) { - String fqn = (String) result; - - try { - result = loader.loadClass(fqn); - } catch (ClassNotFoundException ex) { - Logger.getLogger(FSWrapper.class.getName()).log(Level.FINE, null, ex); - result = CodeHintProviderImpl.findLoader().loadClass(fqn); - } - } - } - - return result; - } - - - private static T loadAnnotation(ClassLoader l, FileObject annotationFolder) throws ClassNotFoundException { - Class clazz = l.loadClass(annotationFolder.getName().replace('-', '.')); - - return (T) Proxy.newProxyInstance(l, new Class[] {clazz}, new InvocationHandlerImpl(l, annotationFolder)); - } - - private static final class InvocationHandlerImpl implements InvocationHandler { - - private final ClassLoader loader; - private final FileObject folder; - private final Map attributes = new HashMap(); - - public InvocationHandlerImpl(ClassLoader loader, FileObject folder) { - this.loader = loader; - this.folder = folder; - } - - public synchronized Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - if (!attributes.containsKey(method.getName())) { - Object result = computeAttributeValue(loader, folder, method.getName(), method.getReturnType(), method.getDefaultValue()); - - attributes.put(method.getName(), result); - } - - return attributes.get(method.getName()); - } - - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/code/ReflectiveCustomizerProvider.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/code/ReflectiveCustomizerProvider.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,261 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2012 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.providers.code; - -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.List; -import java.util.prefs.Preferences; -import javax.swing.JCheckBox; -import javax.swing.JComponent; -import javax.swing.JFormattedTextField; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JSpinner; -import javax.swing.SpinnerNumberModel; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import javax.swing.text.NumberFormatter; -import org.netbeans.spi.java.hints.BooleanOption; -import org.netbeans.spi.java.hints.CustomizerProvider; -import org.netbeans.spi.java.hints.IntegerOption; -import org.openide.util.Exceptions; - -/** - * - * @author lahvac - */ -public class ReflectiveCustomizerProvider implements CustomizerProvider { - private final String hintClassName; - private final String hintId; - private final List options; - - public ReflectiveCustomizerProvider(String hintClassName, String hintId, List options) { - this.hintClassName = hintClassName; - this.hintId = hintId; - this.options = options; - } - - @Override - public JComponent getCustomizer(Preferences prefs) { - return new CustomizerImpl(prefs, hintClassName, hintId, options); - } - - private static final class CustomizerImpl extends JPanel { - private int row; - - public CustomizerImpl(Preferences prefs, String hintClassName, String hintId, List options) { - try { - setLayout(new GridBagLayout()); - row = 0; - - for (OptionDescriptor option : options) { - if (option.parameters instanceof IntegerOption) { - createIntegerOption(option, prefs); - } - } - - for (OptionDescriptor option : options) { - if (option.parameters instanceof BooleanOption) { - createBooleanOption(option, prefs); - } - } - - GridBagConstraints constraints = new GridBagConstraints(); - - constraints.anchor = GridBagConstraints.NORTHWEST; - constraints.fill = GridBagConstraints.BOTH; - constraints.gridheight = 1; - constraints.gridwidth = GridBagConstraints.REMAINDER; - constraints.gridx = 0; - constraints.gridy = row++; - constraints.weightx = 1; - constraints.weighty = 1; - - add(new JPanel(), constraints); - } catch (IllegalArgumentException ex) { - Exceptions.printStackTrace(ex); - } catch (SecurityException ex) { - Exceptions.printStackTrace(ex); - } - } - - private void createIntegerOption(OptionDescriptor option, Preferences prefs) { - IntegerOption iopt = (IntegerOption)option.parameters; - JLabel l = new JLabel(); - org.openide.awt.Mnemonics.setLocalizedText(l, option.displayName + ":"); - - GridBagConstraints constraints = new GridBagConstraints(); - constraints.anchor = GridBagConstraints.WEST; - constraints.fill = GridBagConstraints.NONE; - constraints.gridheight = 1; - constraints.gridwidth = 1; - constraints.gridx = 0; - constraints.gridy = row; - constraints.weightx = 0; - constraints.weighty = 0; - constraints.insets = new Insets(0, 0, 0, 8); - - add(l, constraints); - - JComponent field; - int val = prefs.getInt(option.preferencesKey, ((Integer)option.defaultValue).intValue()); - if (iopt.step() > 0) { - val = Math.min(iopt.maxValue(), Math.max(iopt.minValue(), val)); - JSpinner spinner = new JSpinner( - new SpinnerNumberModel(val, iopt.minValue(), iopt.maxValue(), iopt.step())); - spinner.addChangeListener(new ActionListenerImpl(option.preferencesKey, prefs)); - field = spinner; - } else { - NumberFormatter nf = new NumberFormatter(); - nf.setValueClass(Integer.class); - nf.setMaximum(iopt.maxValue()); - nf.setMinimum(iopt.minValue()); - JFormattedTextField formatted = new JFormattedTextField(nf); - field = formatted; - } - if (option.tooltip != null && !option.tooltip.isEmpty()) { - field.setToolTipText(option.tooltip); - } - constraints = new GridBagConstraints(); - constraints.anchor = GridBagConstraints.WEST; - constraints.fill = GridBagConstraints.HORIZONTAL; - constraints.gridheight = 1; - constraints.gridwidth = 1; - constraints.gridx = 1; - constraints.gridy = row; - constraints.weightx = 0; - constraints.weighty = 0; - - add(field, constraints); - - constraints = new GridBagConstraints(); - constraints.anchor = GridBagConstraints.WEST; - constraints.fill = GridBagConstraints.HORIZONTAL; - constraints.gridheight = 1; - constraints.gridwidth = GridBagConstraints.REMAINDER; - constraints.gridx = 2; - constraints.gridy = row++; - constraints.weightx = 1; - constraints.weighty = 0; - - add(new JPanel(), constraints); - } - - private JComponent createBooleanOption(OptionDescriptor option, Preferences prefs) { - JCheckBox checkBox = new JCheckBox(); - - org.openide.awt.Mnemonics.setLocalizedText(checkBox, option.displayName); - checkBox.setToolTipText(option.tooltip); - checkBox.addActionListener(new ActionListenerImpl(option.preferencesKey, prefs)); - - checkBox.setSelected(prefs.getBoolean(option.preferencesKey, - Boolean.TRUE == option.defaultValue)); - GridBagConstraints constraints = new GridBagConstraints(); - - constraints.anchor = GridBagConstraints.WEST; - constraints.fill = GridBagConstraints.NONE; - constraints.gridheight = 1; - constraints.gridwidth = 2; - constraints.gridx = 0; - constraints.gridy = row++; - constraints.weightx = 0; - constraints.weighty = 0; - - add(checkBox, constraints); - return checkBox; - } - - - private static final class ActionListenerImpl implements ActionListener, ChangeListener { - private final String key; - private final Preferences prefs; - - public ActionListenerImpl(String key, Preferences prefs) { - this.key = key; - this.prefs = prefs; - } - - @Override - public void actionPerformed(ActionEvent e) { - JCheckBox checkBox = ((JCheckBox)e.getSource()); - prefs.putBoolean(key, checkBox.isSelected()); - } - - @Override - public void stateChanged(ChangeEvent e) { - Integer i = (Integer)((JSpinner)e.getSource()).getValue(); - prefs.putInt(key, i); - } - - } - - } - - public static final class OptionDescriptor { - public final String preferencesKey; - public final Object defaultValue; - public final String displayName; - public final String tooltip; - /** - * The original Annotation object, type-specific parameters. - */ - public final Object parameters; - - public OptionDescriptor( - String preferencesKey, - Object defaultValue, - String displayName, String tooltip, - Object parameters) { - this.preferencesKey = preferencesKey; - this.defaultValue = defaultValue; - this.displayName = displayName; - this.tooltip = tooltip; - this.parameters = parameters; - } - - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/ClassPathBasedHintProvider.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/ClassPathBasedHintProvider.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.providers.spi; - -import java.util.Collection; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; - -/** - * XXX: this is another ugly hack! - * @author lahvac - */ -public interface ClassPathBasedHintProvider { - - public Collection computeHints(ClassPath cp); - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/ElementBasedHintProvider.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/ElementBasedHintProvider.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.providers.spi; - -import java.util.Collection; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; - -/** - * XXX: this is an ugly hack! - * @author lahvac - */ -public interface ElementBasedHintProvider { - - public Collection computeHints(CompilationInfo info); - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/HintDescription.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/HintDescription.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,127 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.providers.spi; - -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata.Options; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.java.hints.HintContext; - -/** - * - * @author Jan Lahoda - */ -public final class HintDescription { - - private final HintMetadata metadata; - private final Trigger trigger; - private final Worker worker; - private final AdditionalQueryConstraints additionalConstraints; - private final String hintText; - private final Set options; - - private HintDescription(HintMetadata metadata, Trigger trigger, Worker worker, AdditionalQueryConstraints additionalConstraints, String hintText, Set options) { - this.metadata = metadata; - this.trigger = trigger; - this.worker = worker; - this.additionalConstraints = additionalConstraints; - this.hintText = hintText; - this.options = options; - } - - static HintDescription create(HintMetadata metadata, Trigger trigger, Worker worker, AdditionalQueryConstraints additionalConstraints, String hintText, Set options) { - return new HintDescription(metadata, trigger, worker, additionalConstraints, hintText, options); - } - - @Override - public String toString() { - return "[HintDescription:" + trigger + "]"; - } - - public AdditionalQueryConstraints getAdditionalConstraints() { - return additionalConstraints; - } - - public String getHintText() { - return hintText; - } - - public HintMetadata getMetadata() { - return metadata; - } - - public Trigger getTrigger() { - return trigger; - } - - public Worker getWorker() { - return worker; - } - - public Set getOptions() { - return options; - } - - public static interface Worker { - - public Collection createErrors(HintContext ctx); - - } - - public static final class AdditionalQueryConstraints { - public final Set requiredErasedTypes; - - public AdditionalQueryConstraints(Set requiredErasedTypes) { - this.requiredErasedTypes = Collections.unmodifiableSet(new HashSet(requiredErasedTypes)); - } - - private static final AdditionalQueryConstraints EMPTY = new AdditionalQueryConstraints(Collections.emptySet()); - public static AdditionalQueryConstraints empty() { - return EMPTY; - } - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/HintDescriptionFactory.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/HintDescriptionFactory.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,127 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.providers.spi; - -import java.util.Arrays; -import java.util.Collections; -import java.util.EnumSet; -import java.util.Set; -import org.netbeans.api.annotations.common.NonNull; -import org.netbeans.modules.java.hints.providers.spi.HintDescription.AdditionalQueryConstraints; -import org.netbeans.modules.java.hints.providers.spi.HintDescription.Worker; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata.Options; - -/** - * - * @author lahvac - */ -public class HintDescriptionFactory { - - private HintMetadata metadata; - private Trigger trigger; - private Worker worker; - private AdditionalQueryConstraints additionalConstraints; - private String hintText; - private Set options; - private boolean finished; - - private HintDescriptionFactory() { - } - - public static HintDescriptionFactory create() { - return new HintDescriptionFactory(); - } - - /**TODO: move to create? - * - * @param metadata - * @return - */ - public HintDescriptionFactory setMetadata(HintMetadata metadata) { - this.metadata = metadata; - return this; - } - - public HintDescriptionFactory setTrigger(Trigger trigger) { - if (this.trigger != null) { - throw new IllegalStateException(this.trigger.toString()); - } - - this.trigger = trigger; - return this; - } - - public HintDescriptionFactory setWorker(Worker worker) { - this.worker = worker; - return this; - } - - public HintDescriptionFactory setAdditionalConstraints(AdditionalQueryConstraints additionalConstraints) { - this.additionalConstraints = additionalConstraints; - return this; - } - - public HintDescriptionFactory setHintText(@NonNull String hintText) { - this.hintText = hintText; - return this; - } - - public HintDescriptionFactory addOptions(Options... options) { - if (this.options == null) { - this.options = EnumSet.noneOf(Options.class); - } - this.options.addAll(Arrays.asList(options)); - return this; - } - - public HintDescription produce() { - if (metadata == null) { - metadata = HintMetadata.Builder.create("no-id").addOptions(Options.NON_GUI).build(); - } - if (this.additionalConstraints == null) { - this.additionalConstraints = AdditionalQueryConstraints.empty(); - } - return HintDescription.create(metadata, trigger, worker, additionalConstraints, hintText, options != null ? options : Collections.emptySet()); - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/HintMetadata.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/HintMetadata.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,224 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.providers.spi; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.EnumSet; -import java.util.HashSet; -import java.util.MissingResourceException; -import java.util.ResourceBundle; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.netbeans.spi.editor.hints.Severity; -import org.netbeans.spi.java.hints.CustomizerProvider; -import org.netbeans.spi.java.hints.Hint; -import org.openide.util.NbBundle; - -/** - * - * @author lahvac - */ -public class HintMetadata { - - public final String id; - public final String displayName; - public final String description; - public final String category; - public final boolean enabled; - public final Hint.Kind kind; - public final Severity severity; - public final Collection suppressWarnings; - public final CustomizerProvider customizer; - public final boolean showInTaskList = false; - public final Set options; - - HintMetadata(String id, String displayName, String description, String category, boolean enabled, Hint.Kind kind, Severity severity, Collection suppressWarnings, CustomizerProvider customizer, Set options) { - this.id = id; - this.displayName = displayName; - this.description = description; - this.category = category; - this.enabled = enabled; - this.kind = kind; - this.severity = severity; - this.suppressWarnings = suppressWarnings; - this.customizer = customizer; - this.options = options; - } - - @Override - public String toString() { - return this.displayName; - } - - private static String lookup(ResourceBundle bundle, String key, String def) { - try { - return bundle != null ? bundle.getString(key) : def; - } catch (MissingResourceException mre) { - Logger.getLogger(HintMetadata.class.getName()).log(Level.FINE, null, mre); - return def; - } - } - - public static final class Builder { - private final String id; - private String displayName; - private String description; - private String category; - private boolean enabled; - private Hint.Kind kind; - private Severity severity; - private final Collection suppressWarnings = new ArrayList(); - private CustomizerProvider customizer; - private final Set options = EnumSet.noneOf(Options.class); - - private Builder(String id) { - this.id = id; - this.displayName = ""; - this.description = ""; - this.category = ""; - this.enabled = true; - this.kind = Hint.Kind.INSPECTION; - this.severity = Severity.VERIFIER; - } - - public static Builder create(String id) { - return new Builder(id); - } - - public Builder setDescription(String displayName, String description) { - this.displayName = displayName; - this.description = description; - return this; - } - - public Builder setBundle(ResourceBundle bundle) { - return setBundle(bundle, null, null); - } - - public Builder setBundle(ResourceBundle bundle, String fallbackDisplayName, String fallbackDescription) { - if (fallbackDisplayName == null) fallbackDisplayName = "No Display Name"; - if (fallbackDescription == null) fallbackDescription = "No Description"; - - this.displayName = lookup(bundle, "DN_" + id.replace('$', '.'), fallbackDisplayName); - this.description = lookup(bundle, "DESC_" + id.replace('$', '.'), fallbackDescription); - return this; - } - - public Builder setBundle(String bundleForFQN) { - ResourceBundle bundle; - - try { - int lastDot = bundleForFQN.lastIndexOf('.'); - - assert lastDot >= 0; - - bundle = NbBundle.getBundle(bundleForFQN.substring(0, lastDot + 1) + "Bundle"); - } catch (MissingResourceException mre) { - Logger.getLogger(HintMetadata.class.getName()).log(Level.FINE, null, mre); - bundle = null; - } - return setBundle(bundle); - } - - public Builder setCategory(String category) { - this.category = category; - return this; - } - - public Builder setEnabled(boolean enabled) { - this.enabled = enabled; - return this; - } - - public Builder setKind(Hint.Kind kind) { - this.kind = kind; - return this; - } - - public Builder setSeverity(Severity severity) { - this.severity = severity; - return this; - } - - - public Builder addSuppressWarnings(String... keys) { - this.suppressWarnings.addAll(Arrays.asList(keys)); - return this; - } - - public Builder setCustomizerProvider(CustomizerProvider customizer) { - this.customizer = customizer; - return this; - } - - public Builder addOptions(Options... options) { - this.options.addAll(Arrays.asList(options)); - return this; - } - - public HintMetadata build() { - return new HintMetadata(id, displayName, description, category, enabled, kind, severity, suppressWarnings, customizer, options); - } - - } - - public enum Options { - NON_GUI, - QUERY, - NO_BATCH, - HEAVY; - - public static Set fromHintOptions(Hint.Options... options) { - Set result = new HashSet(); - - for (Hint.Options opt : options) { - result.add(valueOf(opt.name())); - } - - return result; - } - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/HintProvider.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/HintProvider.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.providers.spi; - -import java.util.Collection; -import java.util.Map; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata; - -public interface HintProvider { - - public Map> computeHints(); - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/PositionRefresherHelper.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/PositionRefresherHelper.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,105 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2012 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.providers.spi; - -import java.util.List; -import javax.swing.text.Document; -import org.netbeans.api.annotations.common.CheckForNull; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.lib.editor.util.swing.DocumentUtilities; -import org.netbeans.spi.editor.hints.Context; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.modules.java.hints.providers.spi.PositionRefresherHelper.DocumentVersion; - -/**TODO: should be public? - * - * @author lahvac - */ -public abstract class PositionRefresherHelper { - - private final Object documentKey = new Object(); - private final String key; - - protected PositionRefresherHelper(String key) { - this.key = key; - } - - protected abstract boolean isUpToDate(Context context, Document doc, V oldVersion); - /**XXX: should be protected*/public abstract @CheckForNull List getErrorDescriptionsAt(CompilationInfo info, Context context, Document doc) throws Exception; - - protected final void setVersion(Document doc, V version) { - if (doc != null) { - doc.putProperty(documentKey, version); - } - } - - protected @CheckForNull V getUpToDateDocumentVersion(Context context, Document doc) { - V oldVersion = (V) doc.getProperty(documentKey); - - if (oldVersion == null) return null; - - if (((DocumentVersion) oldVersion).version != DocumentUtilities.getDocumentVersion(doc)) return null; - - return oldVersion; - } - - /**XXX*/ public boolean upToDateCheck(Context context, Document doc) { - V oldVersion = getUpToDateDocumentVersion(context, doc); - - if (oldVersion == null) return false; - - return isUpToDate(context, doc, oldVersion); - } - - /**XXX*/ public String getKey() { - return key; - } - - public static class DocumentVersion { - private final long version; - - public DocumentVersion(Document doc) { - this.version = doc != null ? DocumentUtilities.getDocumentVersion(doc) : 0; - } - - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/Trigger.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/providers/spi/Trigger.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2011 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.providers.spi; - -import com.sun.source.tree.Tree.Kind; -import java.util.Arrays; -import java.util.Map; -import java.util.Set; -import org.netbeans.api.java.source.matching.Pattern; -import org.netbeans.spi.java.hints.Decision; -import org.openide.util.Parameters; - -/**A base class for triggers. - * - * @author lahvac - */ -public abstract class Trigger { - - Trigger() {} - - /**Invoke the given hint's worker on the specified {@link Tree.Kind}(s). - * - */ - public static final class Kinds extends Trigger { - private final Set kinds; - - /**Create the trigger for the specified set of {@link Tree.Kind}s. - * - * @param kinds on which the hint's worker should be invoked. - */ - public Kinds(Set kinds) { - this.kinds = kinds; - } - - public Iterable getKinds() { - return kinds; - } - - @Override - public String toString() { - return kinds.toString(); - } - } - - /**Invoke the hint's worker on tree nodes that match the given pattern. - * - */ - public static final class PatternDescription extends Trigger { - - private final String pattern; - private final Map constraints; - private final Iterable imports; - - private PatternDescription(String pattern, Map constraints, String... imports) { - this.pattern = pattern; - this.constraints = constraints; - this.imports = Arrays.asList(imports); - } - - /** Create the trigger to invoke the hint's worker on tree nodes that match the given pattern. - * - * @param pattern which will be interpreted as a pattern with free variables ({@link Pattern#createPatternWithFreeVariables(com.sun.source.util.TreePath, java.util.Map) }. - * @param constraints are expected to be mapping from a free variable name to the expected type. - * @param XXX: document the imports - * @return the created trigger. - */ - public static PatternDescription create(String pattern, Map constraints, String... imports) { - Parameters.notNull("pattern", pattern); - Parameters.notNull("constraints", constraints); - Parameters.notNull("imports", imports); - - return new PatternDescription(pattern, constraints, imports); - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final PatternDescription other = (PatternDescription) obj; - if ((this.pattern == null) ? (other.pattern != null) : !this.pattern.equals(other.pattern)) { - return false; - } - if (this.constraints != other.constraints && (this.constraints == null || !this.constraints.equals(other.constraints))) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 71 * hash + (this.pattern != null ? this.pattern.hashCode() : 0); - hash = 71 * hash + (this.constraints != null ? this.constraints.hashCode() : 0); - return hash; - } - - public String getPattern() { - return pattern; - } - - public Map getConstraints() { - return constraints; - } - - public Iterable getImports() { - return imports; - } - - @Override - public String toString() { - return pattern; - } - - } - - public static final class DecisionTrigger extends Trigger { - private final Class decisionClass; - - public DecisionTrigger(Class decisionClass) { - this.decisionClass = decisionClass; - } - - public Class getDecisionClass() { - return decisionClass; - } - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Bundle.properties --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -OpenIDE-Module-Name=Java Hints SPI - -#refresh hints -Refresh_hints=Refresh Hints diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Hacks.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Hacks.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,219 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl; - -import com.sun.source.tree.BlockTree; -import com.sun.source.tree.CompilationUnitTree; -import com.sun.source.tree.MethodTree; -import com.sun.source.tree.Scope; -import com.sun.source.tree.Tree; -import com.sun.source.util.TreePath; -import com.sun.source.util.TreePathScanner; -import com.sun.tools.javac.api.JavacTaskImpl; -import com.sun.tools.javac.code.Symbol.ClassSymbol; -import com.sun.tools.javac.comp.AttrContext; -import com.sun.tools.javac.comp.Enter; -import com.sun.tools.javac.comp.Env; -import com.sun.tools.javac.main.JavaCompiler; -import com.sun.tools.javac.tree.JCTree; -import com.sun.tools.javac.tree.JCTree.JCErroneous; -import com.sun.tools.javac.util.Context; -import com.sun.tools.javac.util.Log; -import java.io.File; -import java.io.IOException; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import javax.lang.model.element.VariableElement; -import javax.lang.model.type.TypeMirror; -import javax.tools.JavaFileObject; -import org.netbeans.api.annotations.common.CheckForNull; -import org.netbeans.api.annotations.common.NonNull; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.TreeUtilities; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata; -import org.netbeans.modules.java.source.JavaSourceAccessor; -import org.netbeans.modules.java.source.parsing.FileObjects; -import org.openide.util.Exceptions; - -/** - * - * @author lahvac - */ -public class Hacks { - - //XXX: copied from Utilities, for declarative hints, different import management: - private static long inc; - - public static Scope constructScope(CompilationInfo info, String... importedClasses) { - StringBuilder clazz = new StringBuilder(); - - clazz.append("package $$;\n"); - - for (String i : importedClasses) { - clazz.append("import ").append(i).append(";\n"); - } - - clazz.append("public class $").append(inc++).append("{"); - - clazz.append("private void test() {\n"); - clazz.append("}\n"); - clazz.append("}\n"); - - JavacTaskImpl jti = JavaSourceAccessor.getINSTANCE().getJavacTask(info); - Context context = jti.getContext(); - - JavaCompiler jc = JavaCompiler.instance(context); - Log.instance(context).nerrors = 0; - - JavaFileObject jfo = FileObjects.memoryFileObject("$$", "$", new File("/tmp/t.java").toURI(), System.currentTimeMillis(), clazz.toString()); - boolean oldSkipAPs = jc.skipAnnotationProcessing; - - try { - jc.skipAnnotationProcessing = true; - - Iterable parsed = jti.parse(jfo); - CompilationUnitTree cut = parsed.iterator().next(); - - jti.analyze(jti.enter(parsed)); - - return new ScannerImpl().scan(cut, info); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - return null; - } finally { - jc.skipAnnotationProcessing = oldSkipAPs; - } - } - - private static final class ScannerImpl extends TreePathScanner { - - @Override - public Scope visitBlock(BlockTree node, CompilationInfo p) { - return p.getTrees().getScope(getCurrentPath()); - } - - @Override - public Scope visitMethod(MethodTree node, CompilationInfo p) { - if (node.getReturnType() == null) { - return null; - } - return super.visitMethod(node, p); - } - - @Override - public Scope reduce(Scope r1, Scope r2) { - return r1 != null ? r1 : r2; - } - - } - - - public static Tree createRenameTree(@NonNull Tree originalTree, @NonNull String newName) { - return new RenameTree(originalTree, newName); - } - - public static final class RenameTree extends JCErroneous { - - public final Tree originalTree; - public final String newName; - - public RenameTree(@NonNull Tree originalTree, @NonNull String newName) { - super(com.sun.tools.javac.util.List.nil()); - this.originalTree = originalTree; - this.newName = newName; - } - - } - - public static @CheckForNull TypeMirror parseFQNType(@NonNull CompilationInfo info, @NonNull String spec) { - if (spec.length() == 0) { - return null; - } - - TypeElement jlObject = info.getElements().getTypeElement("java.lang.Object"); - - //XXX: - TypeElement scope; - - if (info.getTopLevelElements().isEmpty()) { - scope = jlObject; - } else { - scope = info.getTopLevelElements().iterator().next(); - } - //XXX end - - return info.getTreeUtilities().parseType(spec, /*XXX: jlObject*/scope); - } - - public static VariableElement attributeThis(CompilationInfo info, TreePath tp) { - //XXX: - while (tp != null) { - if (TreeUtilities.CLASS_TREE_KINDS.contains(tp.getLeaf().getKind())) { - Element currentElement = info.getTrees().getElement(tp); - - if (currentElement == null || !(currentElement instanceof ClassSymbol)) return null; - - Enter enter = Enter.instance(JavaSourceAccessor.getINSTANCE().getJavacTask(info).getContext()); - Env env = enter.getEnv((ClassSymbol) currentElement); - - if (env == null) return null; - - for (Element el : env.info.getLocalElements()) { - if (el.getSimpleName().contentEquals("this")) { - return (VariableElement) el; - } - } - - return null; - } - - tp = tp.getParentPath(); - } - - return null; - } - - public static interface InspectAndTransformOpener { - public void openIAT(HintMetadata hm); - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JackpotTrees.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JackpotTrees.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,246 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl; - -import com.sun.source.tree.IdentifierTree; -import com.sun.source.tree.TreeVisitor; -import com.sun.tools.javac.code.Symbol.VarSymbol; -import com.sun.tools.javac.code.Symtab; -import com.sun.tools.javac.tree.JCTree; -import com.sun.tools.javac.tree.JCTree.JCAnnotation; -import com.sun.tools.javac.tree.JCTree.JCBlock; -import com.sun.tools.javac.tree.JCTree.JCCase; -import com.sun.tools.javac.tree.JCTree.JCCatch; -import com.sun.tools.javac.tree.JCTree.JCModifiers; -import com.sun.tools.javac.tree.JCTree.JCVariableDecl; -import com.sun.tools.javac.tree.TreeMaker; -import com.sun.tools.javac.util.Context; -import com.sun.tools.javac.util.List; -import com.sun.tools.javac.util.Name; - - -/** - * - * @author lahvac - */ -public class JackpotTrees { - public static class AnnotationWildcard extends JCAnnotation implements IdentifierTree { - - private final Name ident; - private final JCIdent jcIdent; - - public AnnotationWildcard(Name ident, JCIdent jcIdent) { - super(Tag.ANNOTATION, jcIdent, List.nil()); - this.ident = ident; - this.jcIdent = jcIdent; - } - - public Name getName() { - return ident; - } - - @Override - public Kind getKind() { - return Kind.IDENTIFIER; - } - - @Override - public void accept(Visitor v) { - v.visitIdent(jcIdent); - } - - @Override - public R accept(TreeVisitor v, D d) { - return v.visitIdentifier(this, d); - } - - @Override - public String toString() { - return ident.toString(); - } - - } - - public static class CatchWildcard extends JCCatch implements IdentifierTree { - - private final Name ident; - private final JCIdent jcIdent; - - public CatchWildcard(Context ctx, Name ident, JCIdent jcIdent) { - super(new FakeVariable(ctx, ident, jcIdent), TreeMaker.instance(ctx).Block(0, List.nil())); - this.ident = ident; - this.jcIdent = jcIdent; - } - - public Name getName() { - return ident; - } - - @Override - public Kind getKind() { - return Kind.IDENTIFIER; - } - - @Override - public void accept(Visitor v) { - v.visitIdent(jcIdent); - } - - @Override - public R accept(TreeVisitor v, D d) { - return v.visitIdentifier(this, d); - } - - @Override - public String toString() { - return "catch " + ident.toString(); - } - - } - - public static class VariableWildcard extends FakeVariable implements IdentifierTree { - - private final Name ident; - - public VariableWildcard(Context ctx, Name ident, JCIdent jcIdent) { - super(ctx, ident, jcIdent); - this.ident = ident; - } - - public Name getName() { - return ident; - } - - @Override - public Kind getKind() { - return Kind.IDENTIFIER; - } - - @Override - public R accept(TreeVisitor v, D d) { - return v.visitIdentifier(this, d); - } - - @Override - public String toString() { - return ident.toString(); - } - } - - private static class FakeVariable extends JCVariableDecl { - - private final JCIdent jcIdent; - - public FakeVariable(Context ctx, Name ident, JCIdent jcIdent) { - super(new FakeModifiers(), ident, createType(ctx), null, null); - this.sym = new VarSymbol(0, name, type, Symtab.instance(ctx).errSymbol); - this.type = vartype.type; - this.jcIdent = jcIdent; - } - - private static JCErroneous createType(Context ctx) { - JCErroneous err = new JCErroneous(List.nil()) {}; - - err.type = Symtab.instance(ctx).errType; - - return err; - } - - @Override - public void accept(Visitor v) { - v.visitIdent(jcIdent); - } - - } - - private static class FakeModifiers extends JCModifiers { - public FakeModifiers() { - super(0, List.nil()); - } - } - - public static class CaseWildcard extends JCCase implements IdentifierTree { - - private final Name ident; - private final JCIdent jcIdent; - - public CaseWildcard(Context ctx, Name ident, JCIdent jcIdent) { - super(jcIdent, List.nil()); - this.ident = ident; - this.jcIdent = jcIdent; - } - - public Name getName() { - return ident; - } - - @Override - public Kind getKind() { - return Kind.IDENTIFIER; - } - - @Override - public void accept(Visitor v) { - v.visitIdent(jcIdent); - } - - @Override - public R accept(TreeVisitor v, D d) { - return v.visitIdentifier(this, d); - } - - @Override - public String toString() { - return "case " + ident.toString(); - } - - } - - public static class FakeBlock extends JCBlock { - - public FakeBlock(long flags, List stats) { - super(flags, stats); - } - - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JavaFixImpl.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JavaFixImpl.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,146 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl; - -import com.sun.source.util.TreePath; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import javax.lang.model.type.TypeMirror; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.JavaSource.Phase; -import org.netbeans.api.java.source.ModificationResult.Difference; -import org.netbeans.api.java.source.Task; -import org.netbeans.api.java.source.WorkingCopy; -import org.netbeans.api.project.Project; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchUtilities; -import org.netbeans.modules.java.source.JavaSourceAccessor; -import org.netbeans.modules.refactoring.spi.RefactoringElementImplementation; -import org.netbeans.spi.editor.hints.ChangeInfo; -import org.netbeans.spi.editor.hints.Fix; -import org.netbeans.spi.java.hints.HintContext; -import org.netbeans.spi.java.hints.JavaFix; -import org.openide.filesystems.FileObject; -import org.openide.util.Exceptions; - -/**TODO: move to better package - * - * @author Jan Lahoda - */ -public final class JavaFixImpl implements Fix { - - public final JavaFix jf; - - public JavaFixImpl(JavaFix jf) { - this.jf = jf; - } - - public String getText() { - return Accessor.INSTANCE.getText(jf); - } - - public ChangeInfo implement() throws Exception { - FileObject file = Accessor.INSTANCE.getFile(jf); - - BatchUtilities.fixDependencies(file, Collections.singletonList(jf), new IdentityHashMap>()); - - JavaSource js = JavaSource.forFileObject(file); - - js.runModificationTask(new Task() { - public void run(WorkingCopy wc) throws Exception { - if (wc.toPhase(Phase.RESOLVED).compareTo(Phase.RESOLVED) < 0) { - return; - } - - Map resourceContentChanges = new HashMap(); - Accessor.INSTANCE.process(jf, wc, true, resourceContentChanges, /*Ignored in editor:*/new ArrayList()); - Map> resourceContentDiffs = new HashMap>(); - BatchUtilities.addResourceContentChanges(resourceContentChanges, resourceContentDiffs); - JavaSourceAccessor.getINSTANCE().createModificationResult(resourceContentDiffs, Collections.emptyMap()).commit(); - } - }).commit(); - - return null; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof JavaFixImpl) { - return jf.equals(((JavaFixImpl)obj).jf); - } - return super.equals(obj); - } - - @Override - public int hashCode() { - return jf.hashCode(); - } - - public static abstract class Accessor { - - static { - try { - Class.forName(JavaFix.class.getCanonicalName(), true, JavaFix.class.getClassLoader()); - } catch (ClassNotFoundException ex) { - Exceptions.printStackTrace(ex); - } - } - - public static Accessor INSTANCE; - - public abstract String getText(JavaFix jf); - public abstract ChangeInfo process(JavaFix jf, WorkingCopy wc, boolean canShowUI, Map resourceContent, Collection fileChanges) throws Exception; - public abstract FileObject getFile(JavaFix jf); - public abstract Map getOptions(JavaFix jf); - public abstract Fix rewriteFix(CompilationInfo info, String displayName, TreePath what, final String to, Map parameters, Map> parametersMulti, final Map parameterNames, Map constraints, Map options, String... imports); - public abstract Fix createSuppressWarningsFix(CompilationInfo compilationInfo, TreePath treePath, String... keys); - public abstract List createSuppressWarnings(CompilationInfo compilationInfo, TreePath treePath, String... keys); - public abstract List resolveDefaultFixes(HintContext ctx, Fix... provided); - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JavaHintsPositionRefresher.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JavaHintsPositionRefresher.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,161 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.swing.text.Document; -import org.netbeans.api.editor.mimelookup.MimeLookup; -import org.netbeans.api.editor.mimelookup.MimeRegistration; -import org.netbeans.api.java.source.CompilationController; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.JavaSource.Phase; -import org.netbeans.api.java.source.Task; -import org.netbeans.api.progress.ProgressUtils; -import org.netbeans.spi.editor.hints.Context; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.editor.hints.PositionRefresher; -import org.netbeans.modules.java.hints.providers.spi.PositionRefresherHelper; -import org.openide.util.Exceptions; -import org.openide.util.NbBundle; - -/** - * Refreshes all Java Hints on current line upon Alt-Enter or mouseclick - * @author Max Sauer - */ -@MimeRegistration(mimeType="text/x-java", service=PositionRefresher.class) -public class JavaHintsPositionRefresher implements PositionRefresher { - - private static final Logger LOG = Logger.getLogger(JavaHintsPositionRefresher.class.getName()); - - @Override - public Map> getErrorDescriptionsAt(final Context context, final Document doc) { - final List refreshers = new ArrayList(MimeLookup.getLookup("text/x-java").lookupAll(PositionRefresherHelper.class)); - - for (Iterator it = refreshers.iterator(); it.hasNext();) { - PositionRefresherHelper h = it.next(); - - if (h.upToDateCheck(context, doc)) { - LOG.log(Level.FINE, "Not computing warnings for {0}, results are up-to-date.", h.getKey()); - it.remove(); - } else { - LOG.log(Level.FINE, "Will compute warnings for {0}, results not up-to-date.", h.getKey()); - } - } - - if (refreshers.isEmpty()) return Collections.emptyMap(); - - final JavaSource js = JavaSource.forDocument(doc); - - if (js == null) { - LOG.log(Level.FINE, "No JavaSource associated to: {0}", new Object[] {doc, doc.getProperty(Document.StreamDescriptionProperty)}); - return Collections.emptyMap(); - } - - final Map> eds = new HashMap>(); - - Runnable r = new Runnable() { - - public void run() { - try { - js.runUserActionTask(new RefreshTask(eds, refreshers, context, doc), true); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - } - }; - - ProgressUtils.runOffEventDispatchThread(r, NbBundle.getMessage(JavaHintsPositionRefresher.class, "Refresh_hints"), context.getCancel(), false); // NOI18N - - return eds; - } - - - private class RefreshTask implements Task { - - private final Map> eds; - private final List refreshers; - private final Context ctx; - private final Document doc; - - public RefreshTask(Map> eds, List refreshers, Context ctx, Document doc) { - this.eds = eds; - this.refreshers = refreshers; - this.ctx = ctx; - this.doc = doc; - } - - public void run(CompilationController controller) throws Exception { - if (controller.toPhase(JavaSource.Phase.RESOLVED).compareTo(Phase.RESOLVED) < 0) { - return ; - } - - Document doc = controller.getDocument(); - - if (doc == null) { - return; - } - - for (PositionRefresherHelper h : refreshers) { - if (ctx.isCanceled()) { - return; - } - - List errors = h.getErrorDescriptionsAt(controller, ctx, doc); - - if (errors == null) continue; - - eds.put(h.getKey(), errors); - } - } - - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/MessageImpl.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/MessageImpl.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl; - -import org.netbeans.spi.java.hints.HintContext.MessageKind; - -/** - * - * @author lahvacc - */ -public class MessageImpl { - - public final MessageKind kind; - public final String text; - - public MessageImpl(MessageKind kind, String text) { - this.kind = kind; - this.text = text; - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/RulesManager.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/RulesManager.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl; - -import java.util.Collection; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; -import org.netbeans.api.annotations.common.NullAllowed; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata; -import org.openide.util.Lookup; - -/** - * - * @author lahvac - */ -public abstract class RulesManager { - - public static RulesManager getInstance() { - return Lookup.getDefault().lookup(RulesManager.class); - } - - public abstract Map> readHints(@NullAllowed CompilationInfo info, @NullAllowed Collection from, @NullAllowed AtomicBoolean cancel); - public abstract void reload(); //XXX - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/RulesManagerImpl.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/RulesManagerImpl.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,140 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.atomic.AtomicBoolean; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.source.ClasspathInfo; -import org.netbeans.api.java.source.ClasspathInfo.PathKind; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata; -import org.netbeans.modules.java.hints.providers.spi.ClassPathBasedHintProvider; -import org.netbeans.modules.java.hints.providers.spi.ElementBasedHintProvider; -import org.netbeans.modules.java.hints.providers.spi.HintProvider; -import org.netbeans.spi.java.classpath.support.ClassPathSupport; -import org.openide.util.Lookup; -import org.openide.util.lookup.ServiceProvider; - -/** - * - * @author lahvac - */ -@ServiceProvider(service=RulesManager.class) -public class RulesManagerImpl extends RulesManager { - - private final Map> globalHints = new HashMap>(); - - public RulesManagerImpl() { - reload(); - } - - @Override - public void reload() { - globalHints.clear(); - - for (HintProvider p : Lookup.getDefault().lookupAll(HintProvider.class)) { - Map> pHints = p.computeHints(); - - if (pHints != null) { - for (Entry> e : pHints.entrySet()) { - globalHints.put(e.getKey(), new ArrayList(e.getValue())); - } - } - } - } - - @Override - public Map> readHints(CompilationInfo info, Collection from, AtomicBoolean cancel) { - Map> result = new HashMap>(globalHints); - - if (info != null) { - for (ElementBasedHintProvider provider : Lookup.getDefault().lookupAll(ElementBasedHintProvider.class)) { - sortByMetadata(provider.computeHints(info), result); - } - } - - if (from == null) { - if (info != null) { - ClasspathInfo cpInfo = info.getClasspathInfo(); - LinkedList cps = new LinkedList(); - - cps.add(cpInfo.getClassPath(PathKind.BOOT)); - cps.add(cpInfo.getClassPath(PathKind.COMPILE)); - cps.add(cpInfo.getClassPath(PathKind.SOURCE)); - - from = cps; - } else { - from = Collections.emptyList(); - } - } - - ClassPath compound = ClassPathSupport.createProxyClassPath(from.toArray(new ClassPath[0])); - - for (ClassPathBasedHintProvider p : Lookup.getDefault().lookupAll(ClassPathBasedHintProvider.class)) { - sortByMetadata(p.computeHints(compound), result); - } - - return result; - } - - public static void sortByMetadata(Collection listedHints, Map> into) { - for (HintDescription hd : listedHints) { - Collection h = into.get(hd.getMetadata()); - - if (h == null) { - into.put(hd.getMetadata(), h = new ArrayList()); - } - - h.add(hd); - } - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/SPIAccessor.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/SPIAccessor.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,86 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2012 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl; - -import com.sun.source.util.TreePath; -import java.util.Collection; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.lang.model.type.TypeMirror; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata; -import org.netbeans.modules.java.hints.spiimpl.hints.GlobalProcessingContext; -import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings; -import org.netbeans.spi.java.hints.HintContext; -import org.openide.util.Exceptions; - -/** - * - * @author lahvac - */ -public abstract class SPIAccessor { - - private static volatile SPIAccessor accessor; - - public static synchronized SPIAccessor getINSTANCE() { - if (accessor == null) { - try { - Class.forName(HintContext.class.getName(), true, HintContext.class.getClassLoader()); - assert accessor != null; - } catch (ClassNotFoundException e) { - Exceptions.printStackTrace(e); - } - } - return accessor; - } - - public static void setINSTANCE(SPIAccessor instance) { - assert instance != null; - accessor = instance; - } - - public abstract HintContext createHintContext(CompilationInfo info, HintsSettings settings, HintMetadata metadata, GlobalProcessingContext globalContext, TreePath path, Map variables, Map> multiVariables, Map variableNames, Map constraints, Collection problems, boolean bulkMode, AtomicBoolean cancel, int caret); - public abstract HintContext createHintContext(CompilationInfo info, HintsSettings settings, HintMetadata metadata, GlobalProcessingContext globalContext, TreePath path, Map variables, Map> multiVariables, Map variableNames); - public abstract HintMetadata getHintMetadata(HintContext ctx); - public abstract HintsSettings getHintSettings(HintContext ctx); - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/SyntheticFix.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/SyntheticFix.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development and - * Distribution License("CDDL") (collectively, the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy of - * the License at http://www.netbeans.org/cddl-gplv2.html or - * nbbuild/licenses/CDDL-GPL-2-CP. See the License for the specific language - * governing permissions and limitations under the License. When distributing - * the software, include this License Header Notice in each file and include - * the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided by - * Oracle in the GPL Version 2 section of the License file that accompanied - * this code. If applicable, add the following below the License Header, with - * the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you do not indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to its - * licensees as provided above. However, if you add GPL Version 2 code and - * therefore, elected the GPL Version 2 license, then the option applies only - * if the new code is made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2011 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl; - -/** - * - * @author lahvac - */ -public interface SyntheticFix { - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1554 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl; - -import com.sun.source.tree.AnnotationTree; -import com.sun.source.tree.AssignmentTree; -import com.sun.source.tree.BlockTree; -import com.sun.source.tree.ClassTree; -import com.sun.source.tree.CompilationUnitTree; -import com.sun.source.tree.ExpressionStatementTree; -import com.sun.source.tree.ExpressionTree; -import com.sun.source.tree.IdentifierTree; -import com.sun.source.tree.ImportTree; -import com.sun.source.tree.LiteralTree; -import com.sun.source.tree.MemberSelectTree; -import com.sun.source.tree.MethodInvocationTree; -import com.sun.source.tree.MethodTree; -import com.sun.source.tree.ModifiersTree; -import com.sun.source.tree.NewArrayTree; -import com.sun.source.tree.NewClassTree; -import com.sun.source.tree.Scope; -import com.sun.source.tree.StatementTree; -import com.sun.source.tree.SwitchTree; -import com.sun.source.tree.Tree; -import com.sun.source.tree.Tree.Kind; -import com.sun.source.tree.TypeParameterTree; -import com.sun.source.tree.VariableTree; -import com.sun.source.util.SourcePositions; -import com.sun.source.util.TreePath; -import com.sun.source.util.TreePathScanner; -import com.sun.source.util.TreeScanner; -import com.sun.source.util.Trees; -import com.sun.tools.javac.api.JavacScope; -import com.sun.tools.javac.api.JavacTaskImpl; -import com.sun.tools.javac.api.JavacTrees; -import com.sun.tools.javac.code.Flags; -import com.sun.tools.javac.code.Symtab; -import com.sun.tools.javac.code.Type; -import com.sun.tools.javac.comp.Attr; -import com.sun.tools.javac.comp.AttrContext; -import com.sun.tools.javac.comp.Env; -import com.sun.tools.javac.comp.Todo; -import com.sun.tools.javac.main.JavaCompiler; -import com.sun.tools.javac.parser.JavacParser; -import com.sun.tools.javac.parser.Lexer; -import com.sun.tools.javac.parser.Parser; -import com.sun.tools.javac.parser.ParserFactory; -import com.sun.tools.javac.parser.Scanner; -import com.sun.tools.javac.parser.ScannerFactory; -import com.sun.tools.javac.parser.Tokens.Token; -import com.sun.tools.javac.parser.Tokens.TokenKind; -import com.sun.tools.javac.tree.JCTree; -import com.sun.tools.javac.tree.JCTree.JCCase; -import com.sun.tools.javac.tree.JCTree.JCCatch; -import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; -import com.sun.tools.javac.tree.JCTree.JCExpression; -import com.sun.tools.javac.tree.JCTree.JCFieldAccess; -import com.sun.tools.javac.tree.JCTree.JCIdent; -import com.sun.tools.javac.tree.JCTree.JCMethodDecl; -import com.sun.tools.javac.tree.JCTree.JCModifiers; -import com.sun.tools.javac.tree.JCTree.JCStatement; -import com.sun.tools.javac.tree.JCTree.JCVariableDecl; -import com.sun.tools.javac.util.Context; -import com.sun.tools.javac.util.JCDiagnostic; -import com.sun.tools.javac.util.ListBuffer; -import com.sun.tools.javac.util.Log; -import com.sun.tools.javac.util.Names; -import com.sun.tools.javadoc.Messager; -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.nio.CharBuffer; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.lang.model.element.AnnotationMirror; -import javax.lang.model.element.AnnotationValue; -import javax.lang.model.element.AnnotationValueVisitor; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.Name; -import javax.lang.model.element.TypeElement; -import javax.lang.model.element.VariableElement; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.Elements; -import javax.tools.Diagnostic; -import javax.tools.JavaCompiler.CompilationTask; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import org.netbeans.api.annotations.common.CheckForNull; -import org.netbeans.api.annotations.common.NonNull; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.platform.JavaPlatform; -import org.netbeans.api.java.platform.JavaPlatformManager; -import org.netbeans.api.java.queries.SourceForBinaryQuery; -import org.netbeans.api.java.queries.SourceForBinaryQuery.Result2; -import org.netbeans.api.java.source.ClasspathInfo; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.CompilationInfo.CacheClearPolicy; -import org.netbeans.api.java.source.SourceUtils; -import org.netbeans.api.java.source.TreeMaker; -import org.netbeans.modules.java.hints.providers.spi.ClassPathBasedHintProvider; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import org.netbeans.modules.java.hints.providers.spi.Trigger.PatternDescription; -import org.netbeans.modules.java.hints.spiimpl.JackpotTrees.CatchWildcard; -import org.netbeans.modules.java.hints.spiimpl.JackpotTrees.VariableWildcard; -import org.netbeans.modules.java.source.JavaSourceAccessor; -import org.netbeans.modules.java.source.builder.TreeFactory; -import org.netbeans.lib.nbjavac.services.CancelService; -import org.netbeans.lib.nbjavac.services.NBParserFactory.NBJavacParser; -import org.netbeans.lib.nbjavac.services.NBParserFactory; -import org.netbeans.lib.nbjavac.services.NBResolve; -import org.netbeans.modules.java.hints.spiimpl.JackpotTrees.AnnotationWildcard; -import org.netbeans.modules.java.hints.spiimpl.JackpotTrees.FakeBlock; -import org.netbeans.modules.java.source.parsing.FileObjects; -import org.netbeans.modules.java.source.pretty.ImportAnalysis2; -import org.netbeans.modules.java.source.transform.ImmutableTreeTranslator; -import org.netbeans.spi.editor.hints.Severity; -import org.netbeans.spi.java.classpath.support.ClassPathSupport; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; -import org.openide.util.Lookup; -import org.openide.util.NbCollections; -import org.openide.util.lookup.ServiceProvider; - -/** - * - * @author Jan Lahoda - */ -public class Utilities { - - private Utilities() {} - - public static Set disableErrors(FileObject file) { - if (file.getAttribute(DISABLE_ERRORS) != null) { - return EnumSet.allOf(Severity.class); - } - if (!file.canWrite() && FileUtil.getArchiveFile(file) != null) { - return EnumSet.allOf(Severity.class); - } - - return EnumSet.noneOf(Severity.class); - } - - private static final String DISABLE_ERRORS = "disable-java-errors"; - - - public static Iterable checkedIterableByFilter(final Iterable raw, final Class type, final boolean strict) { - return new Iterable() { - public Iterator iterator() { - return NbCollections.checkedIteratorByFilter(raw.iterator(), type, strict); - } - }; - } - -// public static AnnotationTree constructConstraint(WorkingCopy wc, String name, TypeMirror tm) { -// TreeMaker make = wc.getTreeMaker(); -// ExpressionTree variable = prepareAssignment(make, "variable", make.Literal(name)); -// ExpressionTree type = prepareAssignment(make, "type", make.MemberSelect((ExpressionTree) make.Type(wc.getTypes().erasure(tm)), "class")); -// TypeElement constraint = wc.getElements().getTypeElement(Annotations.CONSTRAINT.toFQN()); -// -// return make.Annotation(make.QualIdent(constraint), Arrays.asList(variable, type)); -// } - - public static ExpressionTree prepareAssignment(TreeMaker make, String name, ExpressionTree value) { - return make.Assignment(make.Identifier(name), value); - } - - public static ExpressionTree findValue(AnnotationTree m, String name) { - for (ExpressionTree et : m.getArguments()) { - if (et.getKind() == Kind.ASSIGNMENT) { - AssignmentTree at = (AssignmentTree) et; - String varName = ((IdentifierTree) at.getVariable()).getName().toString(); - - if (varName.equals(name)) { - return at.getExpression(); - } - } - - if (et instanceof LiteralTree/*XXX*/ && "value".equals(name)) { - return et; - } - } - - return null; - } - - public static List findArrayValue(AnnotationTree at, String name) { - ExpressionTree fixesArray = findValue(at, name); - List fixes = new LinkedList(); - - if (fixesArray != null && fixesArray.getKind() == Kind.NEW_ARRAY) { - NewArrayTree trees = (NewArrayTree) fixesArray; - - for (ExpressionTree fix : trees.getInitializers()) { - if (fix.getKind() == Kind.ANNOTATION) { - fixes.add((AnnotationTree) fix); - } - } - } - - if (fixesArray != null && fixesArray.getKind() == Kind.ANNOTATION) { - fixes.add((AnnotationTree) fixesArray); - } - - return fixes; - } - - public static boolean isPureMemberSelect(Tree mst, boolean allowVariables) { - switch (mst.getKind()) { - case IDENTIFIER: return allowVariables || ((IdentifierTree) mst).getName().charAt(0) != '$'; - case MEMBER_SELECT: return isPureMemberSelect(((MemberSelectTree) mst).getExpression(), allowVariables); - default: return false; - } - } - - public static Map> sortOutHints(Iterable hints, Map> output) { - for (HintDescription d : hints) { - Collection h = output.get(d.getMetadata().displayName); - - if (h == null) { - output.put(d.getMetadata().displayName, h = new LinkedList()); - } - - h.add(d); - } - - return output; - } - - public static List listAllHints(Set cps) { - List result = new LinkedList(); - - for (Collection hints : RulesManager.getInstance().readHints(null, cps, new AtomicBoolean()).values()) { - for (HintDescription hd : hints) { - if (!(hd.getTrigger() instanceof PatternDescription)) continue; //TODO: only pattern based hints are currently supported - result.add(hd); - } - } - - result.addAll(listClassPathHints(Collections.emptySet(), cps)); - - return result; - } - - public static List listClassPathHints(Set sourceCPs, Set binaryCPs) { - List result = new LinkedList(); - Set roots = new HashSet(); - - for (ClassPath cp : binaryCPs) { - for (FileObject r : cp.getRoots()) { - Result2 src = SourceForBinaryQuery.findSourceRoots2(r.toURL()); - - if (src != null && src.preferSources()) { - roots.addAll(Arrays.asList(src.getRoots())); - } else { - roots.add(r); - } - } - } - - Set cps = new HashSet(sourceCPs); - - cps.add(ClassPathSupport.createClassPath(roots.toArray(new FileObject[0]))); - - ClassPath cp = ClassPathSupport.createProxyClassPath(cps.toArray(new ClassPath[0])); - - for (ClassPathBasedHintProvider p : Lookup.getDefault().lookupAll(ClassPathBasedHintProvider.class)) { - result.addAll(p.computeHints(cp)); - } - - return result; - } - - public static Tree parseAndAttribute(CompilationInfo info, String pattern, Scope scope) { - return parseAndAttribute(info, pattern, scope, null); - } - - public static Tree parseAndAttribute(CompilationInfo info, String pattern, Scope scope, Collection> errors) { - return parseAndAttribute(info, JavaSourceAccessor.getINSTANCE().getJavacTask(info), pattern, scope, errors); - } - - public static Tree parseAndAttribute(CompilationInfo info, String pattern, Scope scope, SourcePositions[] sourcePositions, Collection> errors) { - return parseAndAttribute(info, JavaSourceAccessor.getINSTANCE().getJavacTask(info), pattern, scope, sourcePositions, errors); - } - - public static Tree parseAndAttribute(JavacTaskImpl jti, String pattern) { - return parseAndAttribute(jti, pattern, null); - } - - public static Tree parseAndAttribute(JavacTaskImpl jti, String pattern, Collection> errors) { - return parseAndAttribute(null, jti, pattern, null, errors); - } - - public static Tree parseAndAttribute(JavacTaskImpl jti, String pattern, SourcePositions[] sourcePositions, Collection> errors) { - return parseAndAttribute(null, jti, pattern, null, sourcePositions, errors); - } - - private static Tree parseAndAttribute(CompilationInfo info, JavacTaskImpl jti, String pattern, Scope scope, Collection> errors) { - return parseAndAttribute(info, jti, pattern, scope, new SourcePositions[1], errors); - } - - private static Tree parseAndAttribute(CompilationInfo info, JavacTaskImpl jti, String pattern, Scope scope, SourcePositions[] sourcePositions, Collection> errors) { - Context c = jti.getContext(); - TreeFactory make = TreeFactory.instance(c); - List> patternTreeErrors = new LinkedList>(); - Tree toAttribute; - Tree patternTree = toAttribute = !isStatement(pattern) ? parseExpression(c, pattern, true, sourcePositions, patternTreeErrors) : null; - int offset = 0; - boolean expression = true; - boolean classMember = false; - - if (pattern.startsWith("case ")) {//XXX: should be a lexer token - List> currentPatternTreeErrors = new LinkedList>(); - Tree switchTree = parseStatement(c, "switch ($$foo) {" + pattern + "}", sourcePositions, currentPatternTreeErrors); - - offset = "switch ($$foo) {".length(); - patternTreeErrors = currentPatternTreeErrors; - patternTree = toAttribute = ((SwitchTree) switchTree).getCases().get(0); - } - - if (patternTree == null || isErrorTree(patternTree)) { - SourcePositions[] currentPatternTreePositions = new SourcePositions[1]; - List> currentPatternTreeErrors = new LinkedList>(); - Tree currentPatternTree = parseStatement(c, "{" + pattern + "}", currentPatternTreePositions, currentPatternTreeErrors); - - assert currentPatternTree.getKind() == Kind.BLOCK : currentPatternTree.getKind(); - - List statements = ((BlockTree) currentPatternTree).getStatements(); - - if (statements.size() == 1) { - currentPatternTree = statements.get(0); - } else { - com.sun.tools.javac.util.List newStatements = com.sun.tools.javac.util.List.nil(); - - if (!statements.isEmpty() && !Utilities.isMultistatementWildcardTree(statements.get(0))) - newStatements = newStatements.append((JCStatement) make.ExpressionStatement(make.Identifier("$$1$"))); - for (StatementTree st : statements) { - newStatements = newStatements.append((JCStatement) st); - } - if (!statements.isEmpty() && !Utilities.isMultistatementWildcardTree(statements.get(statements.size() - 1))) - newStatements = newStatements.append((JCStatement) make.ExpressionStatement(make.Identifier("$$2$"))); - - currentPatternTree = new FakeBlock(0L, newStatements); - } - - if (!currentPatternTreeErrors.isEmpty() || containsError(currentPatternTree)) { - //maybe a class member? - SourcePositions[] classPatternTreePositions = new SourcePositions[1]; - List> classPatternTreeErrors = new LinkedList>(); - Tree classPatternTree = parseExpression(c, "new Object() {" + pattern + "}", false, classPatternTreePositions, classPatternTreeErrors); - - if (!containsError(classPatternTree)) { - sourcePositions[0] = classPatternTreePositions[0]; - offset = "new Object() {".length(); - patternTreeErrors = classPatternTreeErrors; - patternTree = toAttribute = classPatternTree; - classMember = true; - } else { - offset = 1; - sourcePositions[0] = currentPatternTreePositions[0]; - VariableTree var; - Names names = Names.instance(jti.getContext()); - if (currentPatternTree.getKind() == Kind.VARIABLE && (var = ((VariableTree) currentPatternTree)).getType().getKind() == Kind.ERRONEOUS && var.getName() == names.error && var.getInitializer() == null && var.getModifiers().getAnnotations().size() == 1 && !containsError(var.getModifiers().getAnnotations().get(0))) { - patternTreeErrors = currentPatternTreeErrors; //TODO: the errors are incorrect - toAttribute = currentPatternTree; - patternTree = var.getModifiers().getAnnotations().get(0); - } else { - patternTreeErrors = currentPatternTreeErrors; - patternTree = toAttribute = currentPatternTree; - } - } - } else { - sourcePositions[0] = currentPatternTreePositions[0]; - offset = 1; - patternTreeErrors = currentPatternTreeErrors; - patternTree = toAttribute = currentPatternTree; - } - - expression = false; - } - - if (scope != null) { - TypeMirror type = attributeTree(jti, toAttribute, scope, patternTreeErrors); - - if (isError(type) && expression) { - //maybe type? - if (Utilities.isPureMemberSelect(patternTree, false)) { - SourcePositions[] varPositions = new SourcePositions[1]; - List> varErrors = new LinkedList>(); - Tree var = parseExpression(c, pattern + ".Class.class;", false, varPositions, varErrors); - - attributeTree(jti, var, scope, varErrors); - - ExpressionTree typeTree = ((MemberSelectTree) ((MemberSelectTree) var).getExpression()).getExpression(); - final Symtab symtab = Symtab.instance(c); - final Elements el = jti.getElements(); - final Trees trees = JavacTrees.instance(c); - CompilationUnitTree cut = ((JavacScope) scope).getEnv().toplevel; - final boolean[] found = new boolean[1]; - - new TreePathScanner() { - @Override public Void visitMemberSelect(MemberSelectTree node, Void p) { - Element currentElement = trees.getElement(getCurrentPath()); - - if (!isError(currentElement)) { - if (currentElement.getKind() == ElementKind.PACKAGE && el.getPackageElement(node.toString()) == null) { - ((JCFieldAccess) node).sym = symtab.errSymbol; - ((JCFieldAccess) node).type = symtab.errType; - } else { - found[0] = true; - return null; - } - } - - return super.visitMemberSelect(node, p); - } - @Override public Void visitIdentifier(IdentifierTree node, Void p) { - Element currentElement = trees.getElement(getCurrentPath()); - - if (!isError(currentElement)) { - if (currentElement.getKind() == ElementKind.PACKAGE && el.getPackageElement(node.toString()) == null) { - ((JCIdent) node).sym = symtab.errSymbol; - ((JCIdent) node).type = symtab.errType; - } else { - found[0] = true; - return null; - } - } - return super.visitIdentifier(node, p); - } - - }.scan(new TreePath(new TreePath(cut), typeTree), null); - - if (found[0]) { - sourcePositions[0] = varPositions[0]; - offset = 0; - patternTreeErrors = varErrors; - patternTree = typeTree; - } - } - } - } - - if (classMember) { - List members = ((NewClassTree) patternTree).getClassBody().getMembers(); - - int syntheticOffset = !members.isEmpty() && members.get(0).getKind() == Kind.METHOD && (((JCMethodDecl) members.get(0)).mods.flags & Flags.GENERATEDCONSTR) != 0 ? 1 : 0; - - if (members.size() > 1 + syntheticOffset) { - ModifiersTree mt = make.Modifiers(EnumSet.noneOf(Modifier.class)); - List newMembers = new LinkedList(); - - newMembers.add(make.ExpressionStatement(make.Identifier("$$1$"))); - newMembers.addAll(members.subList(syntheticOffset, members.size())); - - patternTree = make.Class(mt, "$", Collections.emptyList(), null, Collections.emptyList(), newMembers); - } else { - patternTree = members.get(0 + syntheticOffset); - } - } - - if (errors != null) { - for (Diagnostic d : patternTreeErrors) { - errors.add(new OffsetDiagnostic(d, -offset)); - } - } - - sourcePositions[0] = new OffsetSourcePositions(sourcePositions[0], -offset); - - return patternTree; - } - - static boolean isError(Element el) { - return (el == null || (el.getKind() == ElementKind.CLASS) && isError(((TypeElement) el).asType())); - } - - private static boolean isError(TypeMirror type) { - return type == null || type.getKind() == TypeKind.ERROR; - } - - private static boolean isStatement(String pattern) { - return pattern.trim().endsWith(";"); - } - - private static boolean isErrorTree(Tree t) { - return t.getKind() == Kind.ERRONEOUS || (t.getKind() == Kind.IDENTIFIER && ((IdentifierTree) t).getName().contentEquals("")); //TODO: ... - } - - private static boolean containsError(Tree t) { - return new TreeScanner() { - @Override - public Boolean scan(Tree node, Void p) { - if (node != null && isErrorTree(node)) { - return true; - } - return super.scan(node, p) ==Boolean.TRUE; - } - @Override - public Boolean reduce(Boolean r1, Boolean r2) { - return r1 == Boolean.TRUE || r2 == Boolean.TRUE; - } - }.scan(t, null); - } - - private static JCStatement parseStatement(Context context, CharSequence stmt, SourcePositions[] pos, final List> errors) { - if (stmt == null || (pos != null && pos.length != 1)) - throw new IllegalArgumentException(); - JavaCompiler compiler = JavaCompiler.instance(context); - JavaFileObject prev = compiler.log.useSource(new DummyJFO()); - Log.DiagnosticHandler discardHandler = new Log.DiscardDiagnosticHandler(compiler.log) { - @Override - public void report(JCDiagnostic diag) { - errors.add(diag); - } - }; - try { - CharBuffer buf = CharBuffer.wrap((stmt+"\u0000").toCharArray(), 0, stmt.length()); - ParserFactory factory = ParserFactory.instance(context); - ScannerFactory scannerFactory = ScannerFactory.instance(context); - Names names = Names.instance(context); - Parser parser = new JackpotJavacParser(context, (NBParserFactory) factory, scannerFactory.newScanner(buf, false), false, false, CancelService.instance(context), names); - if (parser instanceof JavacParser) { - if (pos != null) - pos[0] = new ParserSourcePositions((JavacParser)parser); - return parser.parseStatement(); - } - return null; - } finally { - compiler.log.useSource(prev); - compiler.log.popDiagnosticHandler(discardHandler); - } - } - - private static JCExpression parseExpression(Context context, CharSequence expr, boolean onlyFullInput, SourcePositions[] pos, final List> errors) { - if (expr == null || (pos != null && pos.length != 1)) - throw new IllegalArgumentException(); - JavaCompiler compiler = JavaCompiler.instance(context); - JavaFileObject prev = compiler.log.useSource(new DummyJFO()); - Log.DiagnosticHandler discardHandler = new Log.DiscardDiagnosticHandler(compiler.log) { - @Override - public void report(JCDiagnostic diag) { - errors.add(diag); - } - }; - try { - CharBuffer buf = CharBuffer.wrap((expr+"\u0000").toCharArray(), 0, expr.length()); - ParserFactory factory = ParserFactory.instance(context); - ScannerFactory scannerFactory = ScannerFactory.instance(context); - Names names = Names.instance(context); - Scanner scanner = scannerFactory.newScanner(buf, false); - Parser parser = new JackpotJavacParser(context, (NBParserFactory) factory, scanner, false, false, CancelService.instance(context), names); - if (parser instanceof JavacParser) { - if (pos != null) - pos[0] = new ParserSourcePositions((JavacParser)parser); - JCExpression result = parser.parseExpression(); - - if (!onlyFullInput || scanner.token().kind == TokenKind.EOF) { - return result; - } - } - return null; - } finally { - compiler.log.useSource(prev); - compiler.log.popDiagnosticHandler(discardHandler); - } - } - - private static TypeMirror attributeTree(JavacTaskImpl jti, Tree tree, Scope scope, final List> errors) { - Log log = Log.instance(jti.getContext()); - JavaFileObject prev = log.useSource(new DummyJFO()); - Log.DiagnosticHandler discardHandler = new Log.DiscardDiagnosticHandler(log) { - @Override - public void report(JCDiagnostic diag) { - errors.add(diag); - } - }; - NBResolve resolve = NBResolve.instance(jti.getContext()); - resolve.disableAccessibilityChecks(); - try { - Attr attr = Attr.instance(jti.getContext()); - Env env = ((JavacScope) scope).getEnv(); - if (tree instanceof JCExpression) - return attr.attribExpr((JCTree) tree,env, Type.noType); - return attr.attribStat((JCTree) tree,env); - } finally { - log.useSource(prev); - log.popDiagnosticHandler(discardHandler); - resolve.restoreAccessbilityChecks(); - } - } - - public static @CheckForNull CharSequence getWildcardTreeName(@NonNull Tree t) { - if (t.getKind() == Kind.EXPRESSION_STATEMENT && ((ExpressionStatementTree) t).getExpression().getKind() == Kind.IDENTIFIER) { - IdentifierTree identTree = (IdentifierTree) ((ExpressionStatementTree) t).getExpression(); - - return identTree.getName().toString(); - } - - if (t.getKind() == Kind.IDENTIFIER) { - IdentifierTree identTree = (IdentifierTree) t; - String name = identTree.getName().toString(); - - if (name.startsWith("$")) { - return name; - } - } - - if (t.getKind() == Kind.TYPE_PARAMETER) { - String name = ((TypeParameterTree) t).getName().toString(); - - if (name.startsWith("$")) { - return name; - } - } - - return null; - } - - public static boolean isMultistatementWildcard(@NonNull CharSequence name) { - return name.charAt(name.length() - 1) == '$'; - } - - public static boolean isMultistatementWildcardTree(Tree tree) { - CharSequence name = Utilities.getWildcardTreeName(tree); - - return name != null && Utilities.isMultistatementWildcard(name); - } - - private static long inc; - - public static Scope constructScope(CompilationInfo info, Map constraints) { - return constructScope(info, constraints, Collections.emptyList()); - } - - public static Scope constructScope(CompilationInfo info, Map constraints, Iterable auxiliaryImports) { - ScopeDescription desc = new ScopeDescription(constraints, auxiliaryImports); - Scope result = (Scope) info.getCachedValue(desc); - - if (result != null) return result; - - StringBuilder clazz = new StringBuilder(); - - clazz.append("package $;"); - - for (String i : auxiliaryImports) { - clazz.append(i); - } - - long count = inc++; - - clazz.append("public class $" + count + "{"); - - for (Entry e : constraints.entrySet()) { - if (e.getValue() != null) { - clazz.append("private "); - clazz.append(e.getValue().toString()); //XXX - clazz.append(" "); - clazz.append(e.getKey()); - clazz.append(";\n"); - } - } - - clazz.append("private void test() {\n"); - clazz.append("}\n"); - clazz.append("}\n"); - - JavacTaskImpl jti = JavaSourceAccessor.getINSTANCE().getJavacTask(info); - Context context = jti.getContext(); - JavaCompiler compiler = JavaCompiler.instance(context); - Log log = Log.instance(context); - NBResolve resolve = NBResolve.instance(context); - Log.DiagnosticHandler discardHandler = new Log.DiscardDiagnosticHandler(compiler.log); - - JavaFileObject jfo = FileObjects.memoryFileObject("$", "$", new File("/tmp/$" + count + ".java").toURI(), System.currentTimeMillis(), clazz.toString()); - - boolean oldSkipAPs = compiler.skipAnnotationProcessing; - - try { - compiler.skipAnnotationProcessing = true; - resolve.disableAccessibilityChecks(); - - JCCompilationUnit cut = compiler.parse(jfo); - - compiler.enterTrees(com.sun.tools.javac.util.List.of(cut)); - - Todo todo = compiler.todo; - ListBuffer> defer = new ListBuffer<>(); - - while (todo.peek() != null) { - Env env = todo.remove(); - - if (env.toplevel == cut) - compiler.attribute(env); - else - defer = defer.append(env); - } - - todo.addAll(defer); - - Scope res = new ScannerImpl().scan(cut, info); - - info.putCachedValue(desc, res, CacheClearPolicy.ON_SIGNATURE_CHANGE); - - return res; - } finally { - resolve.restoreAccessbilityChecks(); - log.popDiagnosticHandler(discardHandler); - compiler.skipAnnotationProcessing = oldSkipAPs; - } - } - - private static final class ScannerImpl extends TreePathScanner { - - @Override - public Scope visitBlock(BlockTree node, CompilationInfo p) { - return p.getTrees().getScope(getCurrentPath()); - } - - @Override - public Scope visitMethod(MethodTree node, CompilationInfo p) { - if (node.getReturnType() == null) { - return null; - } - return super.visitMethod(node, p); - } - - @Override - public Scope reduce(Scope r1, Scope r2) { - return r1 != null ? r1 : r2; - } - - } - - private static final class ScopeDescription { - private final Map constraints; - private final Iterable auxiliaryImports; - - public ScopeDescription(Map constraints, Iterable auxiliaryImports) { - this.constraints = constraints; - this.auxiliaryImports = auxiliaryImports; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final ScopeDescription other = (ScopeDescription) obj; - if (this.constraints != other.constraints && (this.constraints == null || !this.constraints.equals(other.constraints))) { - return false; - } - if (this.auxiliaryImports != other.auxiliaryImports && (this.auxiliaryImports == null || !this.auxiliaryImports.equals(other.auxiliaryImports))) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 47 * hash + (this.constraints != null ? this.constraints.hashCode() : 0); - hash = 47 * hash + (this.auxiliaryImports != null ? this.auxiliaryImports.hashCode() : 0); - return hash; - } - - } - -// private static Scope constructScope2(CompilationInfo info, Map constraints) { -// JavacScope s = (JavacScope) info.getTrees().getScope(new TreePath(info.getCompilationUnit())); -// Env env = s.getEnv(); -// -// env = env.dup(env.tree); -// -// env.info. -// } - - public static String toHumanReadableTime(double d) { - StringBuilder result = new StringBuilder(); - long inSeconds = (long) (d / 1000); - int seconds = (int) (inSeconds % 60); - long inMinutes = inSeconds / 60; - int minutes = (int) (inMinutes % 60); - long inHours = inMinutes / 60; - - if (inHours > 0) { - result.append(inHours); - result.append("h"); - } - - if (minutes > 0) { - result.append(minutes); - result.append("m"); - } - - result.append(seconds); - result.append("s"); - - return result.toString(); - } - - public static ClasspathInfo createUniversalCPInfo() { - return Lookup.getDefault().lookup(SPI.class).createUniversalCPInfo(); - } - - @SuppressWarnings("deprecation") - public static void waitScanFinished() throws InterruptedException { - SourceUtils.waitScanFinished(); - } - - public static Set findSuppressedWarnings(CompilationInfo info, TreePath path) { - //TODO: cache? - Set keys = new HashSet(); - - while (path != null) { - Tree leaf = path.getLeaf(); - - switch (leaf.getKind()) { - case METHOD: - handleSuppressWarnings(info, path, ((MethodTree) leaf).getModifiers(), keys); - break; - case CLASS: - handleSuppressWarnings(info, path, ((ClassTree) leaf).getModifiers(), keys); - break; - case VARIABLE: - handleSuppressWarnings(info, path, ((VariableTree) leaf).getModifiers(), keys); - break; - } - - path = path.getParentPath(); - } - - return Collections.unmodifiableSet(keys); - } - - private static void handleSuppressWarnings(CompilationInfo info, TreePath path, ModifiersTree modifiers, final Set keys) { - Element el = info.getTrees().getElement(path); - - if (el == null) { - return ; - } - - for (AnnotationMirror am : el.getAnnotationMirrors()) { - Name fqn = ((TypeElement) am.getAnnotationType().asElement()).getQualifiedName(); - - if (!fqn.contentEquals("java.lang.SuppressWarnings")) { - continue; - } - - for (Entry e : am.getElementValues().entrySet()) { - if (!e.getKey().getSimpleName().contentEquals("value")) - continue; - - e.getValue().accept(new AnnotationValueVisitor() { - public Void visit(AnnotationValue av, Void p) { - av.accept(this, p); - return null; - } - public Void visit(AnnotationValue av) { - av.accept(this, null); - return null; - } - public Void visitBoolean(boolean b, Void p) { - return null; - } - public Void visitByte(byte b, Void p) { - return null; - } - public Void visitChar(char c, Void p) { - return null; - } - public Void visitDouble(double d, Void p) { - return null; - } - public Void visitFloat(float f, Void p) { - return null; - } - public Void visitInt(int i, Void p) { - return null; - } - public Void visitLong(long i, Void p) { - return null; - } - public Void visitShort(short s, Void p) { - return null; - } - public Void visitString(String s, Void p) { - keys.add(s); - return null; - } - public Void visitType(TypeMirror t, Void p) { - return null; - } - public Void visitEnumConstant(VariableElement c, Void p) { - return null; - } - public Void visitAnnotation(AnnotationMirror a, Void p) { - return null; - } - public Void visitArray(List vals, Void p) { - for (AnnotationValue av : vals) { - av.accept(this, p); - } - return null; - } - public Void visitUnknown(AnnotationValue av, Void p) { - return null; - } - }, null); - } - } - } - - public static Tree generalizePattern(CompilationInfo info, TreePath original) { - return generalizePattern(JavaSourceAccessor.getINSTANCE().getJavacTask(info), original); - } - - public static Tree generalizePattern(CompilationTask task, TreePath original) { - JavacTaskImpl jti = (JavacTaskImpl) task; - com.sun.tools.javac.util.Context c = jti.getContext(); - TreeFactory make = TreeFactory.instance(c); - Trees javacTrees = Trees.instance(task); - GeneralizePattern gp = new GeneralizePattern(javacTrees, make); - - gp.scan(original, null); - - GeneralizePatternITT itt = new GeneralizePatternITT(gp.tree2Variable); - - itt.attach(c, new NoImports(c), null); - - return itt.translate(original.getLeaf()); - } - - public static Tree generalizePattern(CompilationInfo info, TreePath original, int firstStatement, int lastStatement) { - JavacTaskImpl jti = JavaSourceAccessor.getINSTANCE().getJavacTask(info); - com.sun.tools.javac.util.Context c = jti.getContext(); - TreeFactory make = TreeFactory.instance(c); - Tree translated = Utilities.generalizePattern(jti, original); - - assert translated.getKind() == Kind.BLOCK; - - List newStatements = new LinkedList(); - BlockTree block = (BlockTree) translated; - - if (firstStatement != lastStatement) { - newStatements.add(make.ExpressionStatement(make.Identifier("$s0$"))); - newStatements.addAll(block.getStatements().subList(firstStatement, lastStatement + 1)); - newStatements.add(make.ExpressionStatement(make.Identifier("$s1$"))); - - translated = make.Block(newStatements, block.isStatic()); - } else { - translated = block.getStatements().get(firstStatement); - } - - return translated; - } - - public interface SPI { - public ClasspathInfo createUniversalCPInfo(); - } - - @ServiceProvider(service=SPI.class) - public static final class NbSPIImpl implements SPI { - - public ClasspathInfo createUniversalCPInfo() { - JavaPlatform select = JavaPlatform.getDefault(); - - if (select.getSpecification().getVersion() != null) { - for (JavaPlatform p : JavaPlatformManager.getDefault().getInstalledPlatforms()) { - if (!"j2se".equals(p.getSpecification().getName()) || p.getSpecification().getVersion() == null) continue; - if (p.getSpecification().getVersion().compareTo(select.getSpecification().getVersion()) > 0) { - select = p; - } - } - } - - return ClasspathInfo.create(select.getBootstrapLibraries(), ClassPath.EMPTY, ClassPath.EMPTY); - } - - } - - private static final class GeneralizePattern extends TreePathScanner { - - public final Map tree2Variable = new HashMap(); - private final Map element2Variable = new HashMap(); - private final Trees javacTrees; - private final TreeFactory make; - - private int currentVariableIndex = 0; - - public GeneralizePattern(Trees javacTrees, TreeFactory make) { - this.javacTrees = javacTrees; - this.make = make; - } - - private @NonNull String getVariable(@NonNull Element el) { - String var = element2Variable.get(el); - - if (var == null) { - element2Variable.put(el, var = "$" + currentVariableIndex++); - } - - return var; - } - - private boolean shouldBeGeneralized(@NonNull Element el) { - if (el.getModifiers().contains(Modifier.PRIVATE)) { - return true; - } - - switch (el.getKind()) { - case LOCAL_VARIABLE: - case EXCEPTION_PARAMETER: - case PARAMETER: - return true; - } - - return false; - } - - @Override - public Void visitIdentifier(IdentifierTree node, Void p) { - Element e = javacTrees.getElement(getCurrentPath()); - - if (e != null && shouldBeGeneralized(e)) { - tree2Variable.put(node, make.Identifier(getVariable(e))); - } - - return super.visitIdentifier(node, p); - } - - @Override - public Void visitVariable(VariableTree node, Void p) { - Element e = javacTrees.getElement(getCurrentPath()); - - if (e != null && shouldBeGeneralized(e)) { - VariableTree nue = make.Variable(node.getModifiers(), getVariable(e), node.getType(), node.getInitializer()); - - tree2Variable.put(node, nue); - } - - return super.visitVariable(node, p); - } - - @Override - public Void visitNewClass(NewClassTree node, Void p) { - //XXX: - if (node.getEnclosingExpression() != null) { - tree2Variable.put(node, make.Identifier("$" + currentVariableIndex++)); - return null; - } - - NewClassTree nue = make.NewClass(node.getEnclosingExpression(), Collections.singletonList(make.Identifier("$" + currentVariableIndex++ + "$")), make.Identifier("$" + currentVariableIndex++), Collections.singletonList(make.Identifier("$" + currentVariableIndex++ + "$")), null); - - tree2Variable.put(node, nue); - - return null; - } - - } - - private static final class GeneralizePatternITT extends ImmutableTreeTranslator { - - private final Map tree2Variable; - - public GeneralizePatternITT(Map tree2Variable) { - super(null); - this.tree2Variable = tree2Variable; - } - - @Override - public Tree translate(Tree tree) { - Tree var = tree2Variable.remove(tree); - - if (var != null) { - return super.translate(var); - } - - return super.translate(tree); - } - - } - - private static final class NoImports extends ImportAnalysis2 { - - public NoImports(Context env) { - super(env); - } - - @Override - public void classEntered(ClassTree clazz) {} - - @Override - public void enterVisibleThroughClasses(ClassTree clazz) {} - - @Override - public void classLeft() {} - - @Override - public ExpressionTree resolveImport(MemberSelectTree orig, Element element) { - return orig; - } - - @Override - public void setCompilationUnit(CompilationUnitTree cut) {} - - @Override - public void setImports(List importsToAdd) {} - - @Override - public Set getImports() { - return Collections.emptySet(); - } - - @Override - public void setPackage(ExpressionTree packageNameTree) {} - - } - - public static long patternValue(Tree pattern) { - class VisitorImpl extends TreeScanner { - private int value; - @Override - public Void scan(Tree node, Void p) { - if (node != null) value++; - return super.scan(node, p); - } - @Override - public Void visitIdentifier(IdentifierTree node, Void p) { - if (node.getName().toString().startsWith("$")) value--; - - return super.visitIdentifier(node, p); - } - @Override - public Void visitNewClass(NewClassTree node, Void p) { - return null; - } - } - - VisitorImpl vi = new VisitorImpl(); - - vi.scan(pattern, null); - - return vi.value; - } - - public static boolean containsMultistatementTrees(List statements) { - for (Tree t : statements) { - if (Utilities.isMultistatementWildcardTree(t)) { - return true; - } - } - - return false; - } - - public static boolean isJavadocSupported(CompilationInfo info) { - Context c = JavaSourceAccessor.getINSTANCE().getJavacTask(info).getContext(); - - try { - return c.get(Log.logKey) instanceof Messager; - } catch (NoClassDefFoundError e) { - return false; - } - } - - private static class JackpotJavacParser extends NBJavacParser { - - private final Context ctx; - private final com.sun.tools.javac.util.Name dollar; - public JackpotJavacParser(Context ctx, NBParserFactory fac, - Lexer S, - boolean keepDocComments, - boolean keepLineMap, - CancelService cancelService, - Names names) { - super(fac, S, keepDocComments, keepLineMap, true, cancelService); - this.ctx = ctx; - this.dollar = names.fromString("$"); - } - - @Override - protected JCModifiers modifiersOpt(JCModifiers partial) { - if (token.kind == TokenKind.IDENTIFIER) { - String ident = token.name().toString(); - - if (Utilities.isMultistatementWildcard(ident)) { - com.sun.tools.javac.util.Name name = token.name(); - - nextToken(); - - JCModifiers result = super.modifiersOpt(partial); - - result.annotations = result.annotations.prepend(new AnnotationWildcard(name, F.Ident(name))); - - return result; - } - } - - return super.modifiersOpt(partial); - } - - @Override - public JCVariableDecl formalParameter(boolean lambdaParam) { - if (token.kind == TokenKind.IDENTIFIER) { - if (token.name().startsWith(dollar)) { - com.sun.tools.javac.util.Name name = token.name(); - - Token peeked = S.token(1); - - if (peeked.kind == TokenKind.COMMA || peeked.kind == TokenKind.RPAREN) { - nextToken(); - return new VariableWildcard(ctx, name, F.Ident(name)); - } - } - } - - return super.formalParameter(lambdaParam); - } - - @Override - protected JCVariableDecl implicitParameter() { - if (token.kind == TokenKind.IDENTIFIER) { - if (token.name().startsWith(dollar)) { - com.sun.tools.javac.util.Name name = token.name(); - - Token peeked = S.token(1); - - if (peeked.kind == TokenKind.COMMA || peeked.kind == TokenKind.RPAREN) { - nextToken(); - return new VariableWildcard(ctx, name, F.Ident(name)); - } - } - } - - return super.implicitParameter(); - } - - @Override - protected JCCatch catchClause() { - if (token.kind == TokenKind.CATCH) { - Token peeked = S.token(1); - - if ( peeked.kind == TokenKind.IDENTIFIER - && Utilities.isMultistatementWildcard(peeked.name().toString())) { - accept(TokenKind.CATCH); - - com.sun.tools.javac.util.Name name = token.name(); - - accept(TokenKind.IDENTIFIER); - - return new CatchWildcard(ctx, name, F.Ident(name)); - } else { - nextToken(); - } - } - return super.catchClause(); - } - - @Override - public com.sun.tools.javac.util.List classOrInterfaceBodyDeclaration(com.sun.tools.javac.util.Name className, boolean isInterface) { - if (token.kind == TokenKind.IDENTIFIER) { - if (token.name().startsWith(dollar)) { - com.sun.tools.javac.util.Name name = token.name(); - - Token peeked = S.token(1); - - if (peeked.kind == TokenKind.SEMI) { - nextToken(); - nextToken(); - - return com.sun.tools.javac.util.List.of(F.Ident(name)); - } - } - } - return super.classOrInterfaceBodyDeclaration(className, isInterface); - } - - @Override - protected JCExpression checkExprStat(JCExpression t) { - if (t.getTag() == JCTree.Tag.IDENT) { - if (((IdentifierTree) t).getName().toString().startsWith("$")) { - return t; - } - } - return super.checkExprStat(t); - } - - @Override - protected JCCase switchBlockStatementGroup() { - if (token.kind == TokenKind.CASE) { - Token peeked = S.token(1); - - if (peeked.kind == TokenKind.IDENTIFIER) { - String ident = peeked.name().toString(); - - if (ident.startsWith("$") && ident.endsWith("$")) { - nextToken(); - - int pos = token.pos; - com.sun.tools.javac.util.Name name = token.name(); - - nextToken(); - - if (token.kind == TokenKind.SEMI) { - nextToken(); - } - - return new JackpotTrees.CaseWildcard(ctx, name, F.at(pos).Ident(name)); - } - } - } - - return super.switchBlockStatementGroup(); - } - - - @Override - protected JCTree resource() { - if (token.kind == TokenKind.IDENTIFIER && token.name().startsWith(dollar)) { - Token peeked = S.token(1); - - if (peeked.kind == TokenKind.SEMI || peeked.kind == TokenKind.RPAREN) { - int pos = token.pos; - com.sun.tools.javac.util.Name name = token.name(); - - nextToken(); - - return F.at(pos).Ident(name); - } - } - return super.resource(); - } - - } - - private static final class DummyJFO extends SimpleJavaFileObject { - private DummyJFO() { - super(URI.create("dummy.java"), JavaFileObject.Kind.SOURCE); - } - @Override - public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { - return ""; - } - }; - - /** - * Only for members (i.e. generated constructor): - */ - public static List filterHidden(TreePath basePath, Iterable members) { - List result = new LinkedList(); - - for (Tree t : members) { - if (!isSynthetic(basePath != null ? basePath.getCompilationUnit() : null, t)) { - result.add(t); - } - } - - return result; - } - - private static boolean isSynthetic(CompilationUnitTree cut, Tree leaf) throws NullPointerException { - JCTree tree = (JCTree) leaf; - - if (tree.pos == (-1)) - return true; - - if (leaf.getKind() == Kind.METHOD) { - //check for synthetic constructor: - return (((JCMethodDecl)leaf).mods.flags & Flags.GENERATEDCONSTR) != 0L; - } - - //check for synthetic superconstructor call: - if (cut != null && leaf.getKind() == Kind.EXPRESSION_STATEMENT) { - ExpressionStatementTree est = (ExpressionStatementTree) leaf; - - if (est.getExpression().getKind() == Kind.METHOD_INVOCATION) { - MethodInvocationTree mit = (MethodInvocationTree) est.getExpression(); - - if (mit.getMethodSelect().getKind() == Kind.IDENTIFIER) { - IdentifierTree it = (IdentifierTree) mit.getMethodSelect(); - - if ("super".equals(it.getName().toString())) { - return ((JCCompilationUnit) cut).endPositions.getEndPos(tree) == (-1); - } - } - } - } - - return false; - } - - public static boolean isFakeBlock(Tree t) { - return t instanceof FakeBlock; - } - - public static boolean isFakeClass(Tree t) { - if (!(t instanceof ClassTree)) { - return false; - } - - ClassTree ct = (ClassTree) t; - - if (ct.getMembers().isEmpty()) { - return false; - } - - CharSequence wildcardTreeName = Utilities.getWildcardTreeName(ct.getMembers().get(0)); - - if (wildcardTreeName == null) { - return false; - } - - return wildcardTreeName.toString().startsWith("$$"); - } - - private static final class OffsetSourcePositions implements SourcePositions { - - private final SourcePositions delegate; - private final long offset; - - public OffsetSourcePositions(SourcePositions delegate, long offset) { - this.delegate = delegate; - this.offset = offset; - } - - public long getStartPosition(CompilationUnitTree cut, Tree tree) { - return delegate.getStartPosition(cut, tree) + offset; - } - - public long getEndPosition(CompilationUnitTree cut, Tree tree) { - return delegate.getEndPosition(cut, tree) + offset; - } - - } - - private static final class OffsetDiagnostic implements Diagnostic { - private final Diagnostic delegate; - private final long offset; - - public OffsetDiagnostic(Diagnostic delegate, long offset) { - this.delegate = delegate; - this.offset = offset; - } - - public Diagnostic.Kind getKind() { - return delegate.getKind(); - } - - public S getSource() { - return delegate.getSource(); - } - - public long getPosition() { - return delegate.getPosition() + offset; - } - - public long getStartPosition() { - return delegate.getStartPosition() + offset; - } - - public long getEndPosition() { - return delegate.getEndPosition() + offset; - } - - public long getLineNumber() { - throw new UnsupportedOperationException("Not supported yet."); - } - - public long getColumnNumber() { - throw new UnsupportedOperationException("Not supported yet."); - } - - public String getCode() { - return delegate.getCode(); - } - - public String getMessage(Locale locale) { - return delegate.getMessage(locale); - } - - } - - private static class ParserSourcePositions implements SourcePositions { - - private JavacParser parser; - - private ParserSourcePositions(JavacParser parser) { - this.parser = parser; - } - - public long getStartPosition(CompilationUnitTree file, Tree tree) { - return parser.getStartPos((JCTree)tree); - } - - public long getEndPosition(CompilationUnitTree file, Tree tree) { - return parser.getEndPos((JCTree)tree); - } - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearch.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearch.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,714 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2011 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl.batch; - -import org.netbeans.spi.java.hints.HintContext.MessageKind; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import com.sun.source.tree.Tree; -import com.sun.source.util.TreePath; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.Callable; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.netbeans.api.annotations.common.NonNull; -import org.netbeans.api.annotations.common.NullAllowed; -import org.netbeans.api.fileinfo.NonRecursiveFolder; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.classpath.GlobalPathRegistry; -import org.netbeans.api.java.source.ClasspathInfo; -import org.netbeans.api.java.source.ClasspathInfo.PathKind; -import org.netbeans.api.java.source.CompilationController; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.JavaSource.Phase; -import org.netbeans.api.java.source.Task; -import org.netbeans.api.queries.FileEncodingQuery; -import org.netbeans.modules.java.hints.spiimpl.MessageImpl; -import org.netbeans.modules.java.hints.spiimpl.Utilities; -import org.netbeans.modules.java.hints.spiimpl.hints.HintsInvoker; -import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch; -import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch.BulkPattern; -import org.netbeans.modules.java.hints.providers.spi.HintDescription.AdditionalQueryConstraints; -import org.netbeans.modules.java.hints.providers.spi.Trigger.PatternDescription; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.api.java.source.matching.Matcher; -import org.netbeans.api.java.source.matching.Pattern; -import org.netbeans.modules.java.hints.providers.spi.Trigger.DecisionTrigger; -import org.netbeans.modules.java.hints.spiimpl.SPIAccessor; -import org.netbeans.modules.java.hints.spiimpl.hints.GlobalProcessingContext; -import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings; -import org.netbeans.spi.java.hints.Decision; -import org.netbeans.spi.java.hints.HintContext; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; -import org.openide.util.Exceptions; - -/** - * - * @author lahvac - */ -public class BatchSearch { - - private static final Logger LOG = Logger.getLogger(BatchSearch.class.getName()); - - public static BatchResult findOccurrences(Iterable patterns, Scope scope) { - return findOccurrences(patterns, scope, new ProgressHandleWrapper(null), HintsSettings.getGlobalSettings()); - } - - public static BatchResult findOccurrences(final Iterable patterns, final Scope scope, final ProgressHandleWrapper progress, @NullAllowed HintsSettings settingsProvider) { - return findOccurrencesLocal(patterns, scope.getIndexMapper(patterns), scope.getTodo(), progress, settingsProvider); - } - - private static BatchResult findOccurrencesLocal(final Iterable patterns, final MapIndices indexMapper, final Collection todo, final ProgressHandleWrapper progress, final @NullAllowed HintsSettings settingsProvider) { - final BatchResult[] result = new BatchResult[1]; - - try { - JavaSource.create(Utilities.createUniversalCPInfo()).runUserActionTask(new Task() { - public void run(CompilationController parameter) throws Exception { - result[0] = findOccurrencesLocalImpl(parameter, patterns, indexMapper, todo, progress, settingsProvider); - } - }, true); - } catch (IOException ex) { - throw new IllegalStateException(ex); - } - - return result[0]; - } - - private static BatchResult findOccurrencesLocalImpl(final CompilationInfo info, final Iterable patterns, MapIndices indexMapper, Collection todo, ProgressHandleWrapper progress, HintsSettings settingsProvider) { - boolean hasKindPatterns = false; - - for (HintDescription pattern : patterns) { - if (!(pattern.getTrigger() instanceof PatternDescription)) { - hasKindPatterns = true; - break; - } - } - - final Callable bulkPattern = hasKindPatterns ? null : new Callable() { - private final AtomicReference pattern = new AtomicReference(); - public BulkPattern call() { - if (pattern.get() == null) { - pattern.set(preparePattern(patterns, info)); - } - - return pattern.get(); - } - }; - final Map> result = new HashMap>(); - final Collection problems = new LinkedList(); - ProgressHandleWrapper innerForAll = progress.startNextPartWithEmbedding(ProgressHandleWrapper.prepareParts(2 * todo.size())); - - for (final Folder src : todo) { - LOG.log(Level.FINE, "Processing: {0}", FileUtil.getFileDisplayName(src.getFileObject())); - - IndexEnquirer indexEnquirer;// = indexMapper.findIndex(src.getFileObject(), innerForAll, src.isRecursive()); - -// if (indexEnquirer == null) { - indexEnquirer = new FileSystemBasedIndexEnquirer(src.getFileObject(), src.isRecursive()); -// } - - Collection occurrences = indexEnquirer.findResources(patterns, innerForAll, bulkPattern, problems, settingsProvider); - - if (!occurrences.isEmpty()) { - result.put(indexEnquirer, occurrences); - } - - innerForAll.tick(); - } - - return new BatchResult(result, patterns, problems); - } - - private static BulkPattern preparePattern(final Iterable patterns, CompilationInfo info) { - Collection code = new LinkedList(); - Collection trees = new LinkedList(); - Collection additionalConstraints = new LinkedList(); - - for (HintDescription pattern : patterns) { - String textPattern = ((PatternDescription) pattern.getTrigger()).getPattern(); - - code.add(textPattern); - trees.add(Utilities.parseAndAttribute(info, textPattern, null)); - additionalConstraints.add(pattern.getAdditionalConstraints()); - } - - return BulkSearch.getDefault().create(code, trees, additionalConstraints, new AtomicBoolean()); - } - - public static void getVerifiedSpans(BatchResult candidates, @NonNull ProgressHandleWrapper progress, final VerifiedSpansCallBack callback, final Collection problems, AtomicBoolean cancel) { - getVerifiedSpans(candidates, progress, callback, false, problems, cancel); - } - - public static void getVerifiedSpans(BatchResult candidates, @NonNull ProgressHandleWrapper progress, final VerifiedSpansCallBack callback, boolean doNotRegisterClassPath, final Collection problems, AtomicBoolean cancel) { - int[] parts = new int[candidates.projectId2Resources.size()]; - int index = 0; - - for (Entry> e : candidates.projectId2Resources.entrySet()) { - parts[index++] = e.getValue().size(); - } - - ProgressHandleWrapper inner = progress.startNextPartWithEmbedding(parts); - - for (Entry> e : candidates.projectId2Resources.entrySet()) { - if (cancel.get()) - return; - inner.startNextPart(e.getValue().size()); - - e.getKey().validateResource(e.getValue(), inner, callback, doNotRegisterClassPath, problems, cancel); - } - } - - private static void getLocalVerifiedSpans(Collection resources, @NonNull final ProgressHandleWrapper progress, final VerifiedSpansCallBack callback, boolean doNotRegisterClassPath, final Collection problems, final AtomicBoolean cancel) { - Collection files = new LinkedList(); - final Map file2Resource = new HashMap(); - - for (Resource r : resources) { - FileObject file = r.getResolvedFile(); - - if (file != null) { - files.add(file); - file2Resource.put(file, r); - } else { - callback.cannotVerifySpan(r); - progress.tick(); - } - } - - Map> cp2Files = BatchUtilities.sortFiles(files); - ClassPath[] toRegister = null; - - if (!doNotRegisterClassPath) { - Set toRegisterSet = new HashSet(); - - for (ClasspathInfo cpInfo : cp2Files.keySet()) { - toRegisterSet.add(cpInfo.getClassPath(PathKind.SOURCE)); - } - - toRegister = !toRegisterSet.isEmpty() ? toRegisterSet.toArray(new ClassPath[0]) : null; - - if (toRegister != null) { - GlobalPathRegistry.getDefault().register(ClassPath.SOURCE, toRegister); - try { - Utilities.waitScanFinished(); - } catch (InterruptedException ex) { - Exceptions.printStackTrace(ex); - } - } - } - - callback.groupStarted(); - - try { - final GlobalProcessingContext gpc = new GlobalProcessingContext(); - for (Entry> e : cp2Files.entrySet()) { - try { - List toProcess = new ArrayList(e.getValue()); - final AtomicInteger currentPointer = new AtomicInteger(); - -// for (FileObject f : toProcess) { - while (currentPointer.get() < toProcess.size()) { - if (cancel.get()) - return; - final AtomicBoolean stop = new AtomicBoolean(); -// JavaSource js = JavaSource.create(e.getKey(), f); - JavaSource js = JavaSource.create(e.getKey(), toProcess.subList(currentPointer.get(), toProcess.size())); - - js.runUserActionTask(new Task() { - public void run(CompilationController parameter) throws Exception { - if (stop.get()) return; - if (cancel.get()) return; - - boolean cont = true; - - try { - if (parameter.toPhase(Phase.RESOLVED).compareTo(Phase.RESOLVED) < 0) - return ; - - progress.setMessage("processing: " + FileUtil.getFileDisplayName(parameter.getFileObject())); - Resource r = file2Resource.get(parameter.getFileObject()); - - HintsSettings settings = r.settings; - Iterable enabledHints; - - if (settings == null) { - settings = HintsSettings.getSettingsFor(parameter.getFileObject()); - List hintsCopy = new ArrayList<>(); - for (HintDescription hd : r.hints) { - if (settings.isEnabled(hd.getMetadata())) { - hintsCopy.add(hd); - } - } - enabledHints = hintsCopy; - } else { - enabledHints = r.hints; - } - - List hints = new HintsInvoker(settings, gpc, new AtomicBoolean()).computeHints(parameter, r.hints, problems); - - assert hints != null; - - cont = callback.spansVerified(parameter, r, hints); - } catch (ThreadDeath td) { - throw td; - } catch (Throwable t) { - LOG.log(Level.INFO, "Exception while performing batch processing in " + FileUtil.getFileDisplayName(parameter.getFileObject()), t); - problems.add(new MessageImpl(MessageKind.WARNING, "An exception occurred while processing file: " + FileUtil.getFileDisplayName(parameter.getFileObject()) + " (" + t.getLocalizedMessage() + ").")); - } - - if (cont) { - progress.tick(); - currentPointer.incrementAndGet(); - } else { - stop.set(true); - } - } - }, true); - } - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - } - - final Map> file2Decision = new HashMap>(); - for (List> decisions : gpc.decisions.values()) { - for (Decision d : decisions) { - if (d.makeDecision()) { - List fileDecisions = file2Decision.get(d.root.getFileObject()); - - if (fileDecisions == null) { - file2Decision.put(d.root.getFileObject(), fileDecisions = new ArrayList()); - } - - fileDecisions.add(d); - } - } - } - - Map> cp2FilesAfterDecision = BatchUtilities.sortFiles(file2Decision.keySet()); - - for (Entry> e : cp2FilesAfterDecision.entrySet()) { - JavaSource js = JavaSource.create(e.getKey(), e.getValue()); - - try { - js.runUserActionTask(new Task() { - @Override public void run(CompilationController parameter) throws Exception { - if (parameter.toPhase(Phase.RESOLVED).compareTo(Phase.RESOLVED) < 0) - return ; - - Resource r = file2Resource.get(parameter.getFileObject()); - - HintsSettings settings = r.settings; - - if (settings == null) { - settings = HintsSettings.getSettingsFor(parameter.getFileObject()); - } - - for (Decision d : file2Decision.get(parameter.getFileObject())) { - for (HintDescription hd : r.hints) { - if (!(hd.getTrigger() instanceof DecisionTrigger)) continue; - if (r.settings == null && !settings.isEnabled(hd.getMetadata())) continue; - DecisionTrigger dt = (DecisionTrigger) hd.getTrigger(); - if (dt.getDecisionClass() != d.getClass()) continue; - TreePath tp = d.root.resolve(parameter); - HintContext ctx = SPIAccessor.getINSTANCE().createHintContext(parameter, settings, hd.getMetadata(), new GlobalProcessingContext(), tp, Collections.emptyMap(), Collections.>emptyMap(), Collections.emptyMap()); - ctx.decision = d; - Collection errors = hd.getWorker().createErrors(ctx); - - if (errors != null) { - callback.spansVerified(parameter, file2Resource.get(parameter.getFileObject()), errors); - } - } - } - } - }, true); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - } - } finally { - callback.groupFinished(); - - if (toRegister != null) { - GlobalPathRegistry.getDefault().unregister(ClassPath.SOURCE, toRegister); - } - progress.finish(); - } - } - - public interface VerifiedSpansCallBack { - public void groupStarted(); - public boolean spansVerified(CompilationController wc, Resource r, Collection hints) throws Exception; - public void groupFinished(); - public void cannotVerifySpan(Resource r); - } - - - public static class Folder { - - private FileObject file; - private NonRecursiveFolder folder; - - public Folder(FileObject file) { - this.file = file; - } - - public Folder(NonRecursiveFolder folder) { - this.folder = folder; - } - - public FileObject getFileObject() { - if (file!=null) { - return file; - } - return folder.getFolder(); - - } - - private boolean isRecursive() { - if (file!=null) { - return file.isFolder(); - } - return false; - } - - public static Folder[] convert(FileObject... files) { - Folder[] result = new Folder[files.length]; - for (int i=0;i getTodo(); - public abstract MapIndices getIndexMapper(Iterable hints); - - } - - public static final class BatchResult { - - private final Map> projectId2Resources; - private final Iterable patterns; - public final Collection problems; - - public BatchResult(Map> projectId2Resources, Iterable patterns, Collection problems) { - this.projectId2Resources = projectId2Resources; - this.patterns = patterns; - this.problems = problems; - } - - public Collection> getResources() { - return projectId2Resources.values(); - } - - public Map> getResourcesWithRoots() { - Map> result = new HashMap>(); - - for (Entry> e : projectId2Resources.entrySet()) { - result.put(e.getKey().src, e.getValue()); - } - - return result; - } - - public Iterable getPatterns() { - return patterns; - } - } - - public static final class Resource { - private final IndexEnquirer indexEnquirer; - private final String relativePath; - final Iterable hints; - private final BulkPattern pattern; - final HintsSettings settings; - - public Resource(IndexEnquirer indexEnquirer, String relativePath, Iterable hints, BulkPattern pattern, HintsSettings settings) { - this.indexEnquirer = indexEnquirer; - this.relativePath = relativePath; - this.hints = hints; - this.pattern = pattern; - this.settings = settings; - } - - public String getRelativePath() { - return relativePath; - } - - public Iterable getCandidateSpans() { - FileObject file = getResolvedFile(); - JavaSource js; - - if (file != null) { - js = JavaSource.forFileObject(file); - } else { - CharSequence text = getSourceCode(); - - if (text == null) { - return null; - } - - Writer out = null; - - try { - file = FileUtil.createData(FileUtil.createMemoryFileSystem().getRoot(), relativePath); - out = new OutputStreamWriter(file.getOutputStream()); - - out.write(text.toString()); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - return null; - } finally { - if (out != null) { - try { - out.close(); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - } - } - - js = JavaSource.create(Utilities.createUniversalCPInfo(), file); - } - - final List span = new LinkedList(); - - try { - js.runUserActionTask(new Task() { - public void run(CompilationController cc) throws Exception { - cc.toPhase(Phase.PARSED); - - span.addAll(doComputeSpans(cc)); - } - }, true); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - - return span; - } - - private Collection doComputeSpans(CompilationInfo ci) { - Collection result = new LinkedList(); - Map> found = BulkSearch.getDefault().match(ci, new AtomicBoolean(), new TreePath(ci.getCompilationUnit()), pattern); - - for (Entry> e : found.entrySet()) { - Tree treePattern = Utilities.parseAndAttribute(ci, e.getKey(), null); - - for (TreePath tp : e.getValue()) { - //XXX: this pass will not be performed on the web!!! - if ( BulkSearch.getDefault().requiresLightweightVerification() - && !Matcher.create(ci).setCancel(new AtomicBoolean()).setSearchRoot(tp).setTreeTopSearch().setUntypedMatching().match(Pattern.createSimplePattern(new TreePath(new TreePath(ci.getCompilationUnit()), treePattern))).iterator().hasNext()) { - continue; - } - int[] span = new int[] { - (int) ci.getTrees().getSourcePositions().getStartPosition(ci.getCompilationUnit(), tp.getLeaf()), - (int) ci.getTrees().getSourcePositions().getEndPosition(ci.getCompilationUnit(), tp.getLeaf()) - }; - - result.add(span); - } - } - - return result; - } - - public FileObject getResolvedFile() { - return indexEnquirer.src.getFileObject(relativePath); - } - - public String getDisplayName() { - FileObject file = getResolvedFile(); - - if (file != null) { - return FileUtil.getFileDisplayName(file); - } else { - return relativePath; //TODO:+container - } - } - - public CharSequence getSourceCode() { - try { - FileObject file = getResolvedFile(); - ByteBuffer bb = ByteBuffer.wrap(file.asBytes()); - - return FileEncodingQuery.getEncoding(file).decode(bb); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - return null; - } - } - - public FileObject getRoot() { - return indexEnquirer.src; - } - } - - public static interface MapIndices { - public IndexEnquirer findIndex(FileObject root, ProgressHandleWrapper progress, boolean recursive); - } - - public static abstract class IndexEnquirer { - final FileObject src; - public IndexEnquirer(FileObject src) { - this.src = src; - } - public abstract Collection findResources(Iterable hints, ProgressHandleWrapper progress, @NullAllowed Callable bulkPattern, Collection problems, HintsSettings settingsProvider); - public abstract void validateResource(Collection resources, ProgressHandleWrapper progress, VerifiedSpansCallBack callback, boolean doNotRegisterClassPath, Collection problems, AtomicBoolean cancel); -// public int[] getEstimatedSpan(Resource r); - } - - public static abstract class LocalIndexEnquirer extends IndexEnquirer { - public LocalIndexEnquirer(FileObject src) { - super(src); - } - public void validateResource(Collection resources, ProgressHandleWrapper progress, VerifiedSpansCallBack callback, boolean doNotRegisterClassPath, Collection problems, AtomicBoolean cancel) { - getLocalVerifiedSpans(resources, progress, callback, doNotRegisterClassPath, problems, cancel); - } - } - - public static final class FileSystemBasedIndexEnquirer extends LocalIndexEnquirer { - private boolean recursive; - public FileSystemBasedIndexEnquirer(FileObject src, boolean recursive) { - super(src); - this.recursive = recursive; - } - public Collection findResources(final Iterable hints, ProgressHandleWrapper progress, final @NullAllowed Callable bulkPattern, final Collection problems, final HintsSettings settingsProvider) { - Collection files = new LinkedList(); - - final ProgressHandleWrapper innerProgress = progress.startNextPartWithEmbedding(30, 70); - - BatchUtilities.recursive(src, src, files, innerProgress, 0, null, null, recursive); - - LOG.log(Level.FINE, "files: {0}", files); - - innerProgress.startNextPart(files.size()); - - final Collection result = new ArrayList(); - - if (!files.isEmpty()) { - try { - if (bulkPattern != null) { - long start = System.currentTimeMillis(); - - JavaSource.create(Utilities.createUniversalCPInfo(), files).runUserActionTask(new Task() { - public void run(CompilationController cc) throws Exception { - if (cc.toPhase(Phase.PARSED).compareTo(Phase.PARSED) <0) { - return ; - } - - try { - boolean matches = BulkSearch.getDefault().matches(cc, new AtomicBoolean(), new TreePath(cc.getCompilationUnit()), bulkPattern.call()); - - if (matches) { - result.add(new Resource(FileSystemBasedIndexEnquirer.this, FileUtil.getRelativePath(src, cc.getFileObject()), hints, bulkPattern.call(), settingsProvider)); - } - } catch (ThreadDeath td) { - throw td; - } catch (Throwable t) { - LOG.log(Level.INFO, "Exception while performing batch search in " + FileUtil.getFileDisplayName(cc.getFileObject()), t); - problems.add(new MessageImpl(MessageKind.WARNING, "An exception occurred while testing file: " + FileUtil.getFileDisplayName(cc.getFileObject()) + " (" + t.getLocalizedMessage() + ").")); - } - - innerProgress.tick(); - } - }, true); - - long end = System.currentTimeMillis(); - - LOG.log(Level.FINE, "took: {0}, per file: {1}", new Object[]{end - start, (end - start) / files.size()}); - } else { - for (FileObject file : files) { - result.add(new Resource(this, FileUtil.getRelativePath(src, file), hints, null, settingsProvider)); - } - } - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - } - - return result; - } - - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchUtilities.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchUtilities.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,586 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2011 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl.batch; - -import com.sun.tools.javac.api.JavacTaskImpl; -import com.sun.tools.javac.util.Log; -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.nio.ByteBuffer; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.IdentityHashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.swing.text.BadLocationException; -import javax.swing.text.Document; -import org.netbeans.api.annotations.common.CheckForNull; -import org.netbeans.api.annotations.common.NonNull; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.classpath.ClassPath.PathConversionMode; -import org.netbeans.api.java.platform.JavaPlatformManager; -import org.netbeans.api.java.source.ClasspathInfo; -import org.netbeans.api.java.source.CompilationController; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.JavaSource.Phase; -import org.netbeans.api.java.source.ModificationResult; -import org.netbeans.api.java.source.ModificationResult.Difference; -import org.netbeans.api.java.source.Task; -import org.netbeans.api.java.source.WorkingCopy; -import org.netbeans.api.project.FileOwnerQuery; -import org.netbeans.api.project.Project; -import org.netbeans.api.project.ProjectUtils; -import org.netbeans.api.project.SourceGroup; -import org.netbeans.api.project.Sources; -import org.netbeans.api.queries.FileEncodingQuery; -import org.netbeans.api.queries.VisibilityQuery; -//import org.netbeans.modules.java.editor.semantic.SemanticHighlighter; -import org.netbeans.modules.java.hints.spiimpl.JavaFixImpl; -import org.netbeans.modules.java.hints.spiimpl.JavaFixImpl.Accessor; -import org.netbeans.modules.java.hints.spiimpl.MessageImpl; -import org.netbeans.modules.java.hints.spiimpl.SyntheticFix; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.BatchResult; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Resource; -import org.netbeans.modules.java.hints.spiimpl.ipi.upgrade.ProjectDependencyUpgrader; -import org.netbeans.modules.java.source.JavaSourceAccessor; -import org.netbeans.modules.java.source.parsing.CompilationInfoImpl; -import org.netbeans.modules.java.source.save.DiffUtilities; -import org.netbeans.modules.java.source.save.ElementOverlay; -import org.netbeans.modules.parsing.api.Source; -import org.netbeans.modules.refactoring.spi.RefactoringElementImplementation; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.editor.hints.Fix; -import org.netbeans.spi.java.hints.HintContext.MessageKind; -import org.netbeans.spi.java.hints.JavaFix; -import org.openide.cookies.EditorCookie; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; -import org.openide.loaders.DataObject; -import org.openide.loaders.DataObjectNotFoundException; -import org.openide.util.Exceptions; -import org.openide.util.Lookup; - -/** - * - * @author Jan Lahoda - */ -public class BatchUtilities { - - private static final Logger LOG = Logger.getLogger(BatchUtilities.class.getName()); - - public static Collection applyFixes(BatchResult candidates, @NonNull final ProgressHandleWrapper progress, AtomicBoolean cancel, final Collection problems) { - return applyFixes(candidates, progress, cancel, new ArrayList(), problems); - } - - public static Collection applyFixes(BatchResult candidates, @NonNull final ProgressHandleWrapper progress, AtomicBoolean cancel, final Collection fileChanges, final Collection problems) { - return applyFixes(candidates, progress, cancel, fileChanges, null, problems); - } - - public static Collection applyFixes(BatchResult candidates, @NonNull final ProgressHandleWrapper progress, AtomicBoolean cancel, final Collection fileChanges, final Map changesPerFix, final Collection problems) { - return applyFixes(candidates, progress, cancel, fileChanges, changesPerFix, false, problems); - } - - public static Collection applyFixes(BatchResult candidates, @NonNull final ProgressHandleWrapper progress, AtomicBoolean cancel, final Collection fileChanges, final Map changesPerFix, boolean doNotRegisterClassPath, final Collection problems) { - final Map> processedDependencyChanges = new IdentityHashMap>(); - final Map> result = new LinkedHashMap>(); - final Map resourceContentChanges = new HashMap(); - - BatchSearch.VerifiedSpansCallBack callback = new BatchSearch.VerifiedSpansCallBack() { - private ElementOverlay overlay; - public void groupStarted() { - overlay = ElementOverlay.getOrCreateOverlay(); - } - public boolean spansVerified(CompilationController wc, Resource r, Collection hints) throws Exception { - if (hints.isEmpty()) return true; - - Constructor wcConstr = WorkingCopy.class.getDeclaredConstructor(CompilationInfoImpl.class, ElementOverlay.class); - wcConstr.setAccessible(true); - -// final WorkingCopy copy = new WorkingCopy(JavaSourceAccessor.getINSTANCE().getCompilationInfoImpl(parameter), overlay); - WorkingCopy copy = wcConstr.newInstance(JavaSourceAccessor.getINSTANCE().getCompilationInfoImpl(wc), overlay); - Method setJavaSource = CompilationInfo.class.getDeclaredMethod("setJavaSource", JavaSource.class); - setJavaSource.setAccessible(true); - -// copy.setJavaSource(JavaSource.this); - setJavaSource.invoke(copy, wc.getJavaSource()); - - copy.toPhase(Phase.RESOLVED); - progress.tick(); - - if (applyFixes(copy, processedDependencyChanges, hints, resourceContentChanges, fileChanges, changesPerFix, problems)) { - return false; - } - - final JavacTaskImpl jt = JavaSourceAccessor.getINSTANCE().getJavacTask(copy); - Log.instance(jt.getContext()).nerrors = 0; - Method getChanges = WorkingCopy.class.getDeclaredMethod("getChanges", Map.class); - getChanges.setAccessible(true); - - result.put(copy.getFileObject(), (List) getChanges.invoke(copy, new HashMap())); - - if (LOG.isLoggable(Level.FINE)) { - LOG.log(Level.FINE, "fixes applied to: {0}", FileUtil.getFileDisplayName(wc.getFileObject())); - } - - return true; - } - - public void groupFinished() { - overlay = null; - } - - public void cannotVerifySpan(Resource r) { - problems.add(new MessageImpl(MessageKind.WARNING, "Cannot parse: " + r.getRelativePath())); - } - }; - - BatchSearch.getVerifiedSpans(candidates, progress, callback, doNotRegisterClassPath, problems, cancel); - - addResourceContentChanges(resourceContentChanges, result); - - return Collections.singletonList(JavaSourceAccessor.getINSTANCE().createModificationResult(result, Collections.emptyMap())); - } - - public static void addResourceContentChanges(final Map resourceContentChanges, final Map> result) { - for (Entry e : resourceContentChanges.entrySet()) { - try { - Charset encoding = FileEncodingQuery.getEncoding(e.getKey()); - final Document originalDocument = getDocument(e.getKey()); - final String[] origContent = new String[1]; - final Source[] s = new Source[1]; - if (originalDocument != null) { - originalDocument.render(new Runnable() { - @Override public void run() { - try { - origContent[0] = originalDocument.getText(0, originalDocument.getLength()); - s[0] = Source.create(originalDocument); - } catch (BadLocationException ex) { - Exceptions.printStackTrace(ex); - } - } - }); - } - - if (origContent[0] == null) { - byte[] origBytes = e.getKey().asBytes(); - origContent[0] = encoding.newDecoder().decode(ByteBuffer.wrap(origBytes)).toString(); - } - String newContent = encoding.newDecoder().decode(ByteBuffer.wrap(e.getValue())).toString(); - - result.put(e.getKey(), DiffUtilities.diff2ModificationResultDifference(e.getKey(), null, Collections.emptyMap(), origContent[0], newContent, s[0])); - } catch (BadLocationException ex) { - Exceptions.printStackTrace(ex); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - } - } - - public static @CheckForNull Document getDocument(@NonNull FileObject file) { - try { - DataObject od = DataObject.find(file); - EditorCookie ec = od.getLookup().lookup(EditorCookie.class); - - if (ec == null) return null; - - return ec.getDocument(); - } catch (DataObjectNotFoundException ex) { - LOG.log(Level.FINE, null, ex); - return null; - } - } - - private static String positionToString(ErrorDescription ed) { - try { - return ed.getFile().getNameExt() + ":" + ed.getRange().getBegin().getLine(); - } catch (IOException ex) { - LOG.log(Level.FINE, null, ex); - return ed.getFile().getNameExt(); - } - } - -// public static void removeUnusedImports(Collection files) throws IOException { -// Map> sortedFastFiles = sortFiles(files); -// -// for (Entry> e : sortedFastFiles.entrySet()) { -// JavaSource.create(e.getKey(), e.getValue()).runModificationTask(new RemoveUnusedImports()).commit(); -// } -// } -// -// private static final class RemoveUnusedImports implements Task { -// public void run(WorkingCopy wc) throws IOException { -// Document doc = wc.getSnapshot().getSource().getDocument(true); -// -// if (wc.toPhase(Phase.RESOLVED).compareTo(Phase.RESOLVED) < 0) { -// return; -// } -// -// //compute imports to remove: -// List unusedImports = SemanticHighlighter.computeUnusedImports(wc); -// CompilationUnitTree cut = wc.getCompilationUnit(); -// // make the changes to the source -// for (TreePathHandle handle : unusedImports) { -// TreePath path = handle.resolve(wc); -// assert path != null; -// cut = wc.getTreeMaker().removeCompUnitImport(cut, -// (ImportTree) path.getLeaf()); -// } -// -// if (!unusedImports.isEmpty()) { -// wc.rewrite(wc.getCompilationUnit(), cut); -// } -// } -// } - - public static boolean applyFixes(WorkingCopy copy, Map> processedDependencyChanges, Collection hints, Map resourceContentChanges, Collection fileChanges, Collection problems) throws IllegalStateException, Exception { - return applyFixes(copy, processedDependencyChanges, hints, resourceContentChanges, fileChanges, null, problems); - } - - public static boolean applyFixes(WorkingCopy copy, Map> processedDependencyChanges, Collection hints, Map resourceContentChanges, Collection fileChanges, Map changesPerFix, Collection problems) throws IllegalStateException, Exception { - Set fixes = new LinkedHashSet(); - for (ErrorDescription ed : hints) { - if (!ed.getFixes().isComputed()) { - throw new IllegalStateException();//TODO: should be problem - } - - Fix toApply = null; - - for (Fix f : ed.getFixes().getFixes()) { - if (f instanceof SyntheticFix) continue; - if (toApply == null) toApply = f; - else problems.add(new MessageImpl(MessageKind.WARNING, "More than one fix for: " + ed.getDescription() + " at " + positionToString(ed) + ", only the first one will be used.")); - } - - if (toApply == null) { - //TODO: currently giving a warning so that the hints can be augmented with "Options.QUERY", but that should be removed - //if a non-query hint cannot produce any fix, it is likely Ok - if not, the hint should produce a warning itself - boolean doWarning = false; - assert doWarning = true; - if (doWarning) { - problems.add(new MessageImpl(MessageKind.WARNING, "No fix for: " + ed.getDescription() + " at " + positionToString(ed) + ".")); - } - continue; - } - - if (!(toApply instanceof JavaFixImpl)) { - throw new IllegalStateException(toApply.getClass().getName());//XXX: hints need to provide JavaFixes - } - - - fixes.add(((JavaFixImpl) toApply).jf); - } - if (fixDependencies(copy.getFileObject(), fixes, processedDependencyChanges)) { - return true; - } - for (JavaFix f : fixes) { -// if (cancel.get()) return ; - - JavaFixImpl.Accessor.INSTANCE.process(f, copy, false, resourceContentChanges, fileChanges); - - if (changesPerFix != null) { - ElementOverlay overlay = ElementOverlay.getOrCreateOverlay(); //XXX: will use the incorrect overlay? - Constructor wcConstr = WorkingCopy.class.getDeclaredConstructor(CompilationInfoImpl.class, ElementOverlay.class); - wcConstr.setAccessible(true); - -// final WorkingCopy copy = new WorkingCopy(JavaSourceAccessor.getINSTANCE().getCompilationInfoImpl(parameter), overlay); - WorkingCopy perFixCopy = wcConstr.newInstance(JavaSourceAccessor.getINSTANCE().getCompilationInfoImpl(copy), overlay); - Method setJavaSource = CompilationInfo.class.getDeclaredMethod("setJavaSource", JavaSource.class); - setJavaSource.setAccessible(true); - -// copy.setJavaSource(JavaSource.this); - setJavaSource.invoke(perFixCopy, copy.getJavaSource()); - - perFixCopy.toPhase(Phase.RESOLVED); - - final Map perFixResourceContentChanges = new HashMap(); - - JavaFixImpl.Accessor.INSTANCE.process(f, perFixCopy, false, perFixResourceContentChanges, new ArrayList()); - - final JavacTaskImpl jt = JavaSourceAccessor.getINSTANCE().getJavacTask(perFixCopy); - Log.instance(jt.getContext()).nerrors = 0; - Method getChanges = WorkingCopy.class.getDeclaredMethod("getChanges", Map.class); - getChanges.setAccessible(true); - - Map> changes = new HashMap>(); - - changes.put(perFixCopy.getFileObject(), (List) getChanges.invoke(perFixCopy, new HashMap())); - - addResourceContentChanges(resourceContentChanges, changes); - - for (Iterator>> it = changes.entrySet().iterator(); it.hasNext();) { - if (it.next().getValue().isEmpty()) it.remove(); - } - - if (!changes.isEmpty()) { - ModificationResult perFixResult = JavaSourceAccessor.getINSTANCE().createModificationResult(changes, Collections.emptyMap()); - - changesPerFix.put(f, perFixResult); - } - } - } - return false; - } - - public static Collection applyFixes(final Map> toRun) { - final Map> result = new LinkedHashMap>(); - final Map resourceContentChanges = new HashMap(); - Map> cp2Files = BatchUtilities.sortFiles(toRun.keySet()); - - for (Entry> e : cp2Files.entrySet()) { - try { - ModificationResult mr = JavaSource.create(e.getKey(), e.getValue()).runModificationTask(new Task() { - @Override - public void run(WorkingCopy parameter) throws Exception { - if (parameter.toPhase(Phase.RESOLVED).compareTo(Phase.RESOLVED) < 0) return ; - - for (JavaFix jf : toRun.get(parameter.getFileObject())) { - JavaFixImpl.Accessor.INSTANCE.process(jf, parameter, false, resourceContentChanges, new ArrayList()); - } - } - }); - - result.putAll(JavaSourceAccessor.getINSTANCE().getDiffsFromModificationResult(mr)); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - } - - addResourceContentChanges(resourceContentChanges, result); - - return Collections.singletonList(JavaSourceAccessor.getINSTANCE().createModificationResult(result, Collections.emptyMap())); - } - - public static Collection getSourceGroups(Iterable prjs) { - List result = new LinkedList(); - - for (Project p : prjs) { - Sources s = ProjectUtils.getSources(p); - - for (SourceGroup sg : s.getSourceGroups("java")) { - result.add(sg.getRootFolder()); - } - } - - return result; - } - - public static Map> sortFiles(Collection from) { - Map> m = new HashMap>(); - - for (FileObject f : from) { - CPCategorizer cpCategorizer = new CPCategorizer(f); - - Collection files = m.get(cpCategorizer); - - if (files == null) { - m.put(cpCategorizer, files = new LinkedList()); - } - - files.add(f); - } - - Map> result = new IdentityHashMap>(); - - for (Entry> e : m.entrySet()) { - result.put(ClasspathInfo.create(e.getKey().boot, e.getKey().compile, e.getKey().source), e.getValue()); - } - - return result; - } - - private static final ClassPath getClassPath(FileObject forFO, String id) { - ClassPath result = ClassPath.getClassPath(forFO, id); - - if (result == null) { - if (ClassPath.BOOT.equals(id)) { - result = JavaPlatformManager.getDefault().getDefaultPlatform().getBootstrapLibraries(); - } else { - result = ClassPath.EMPTY; - } - } - - return result; - } - - private static final class CPCategorizer { - private final String cps; - private final ClassPath boot; - private final ClassPath compile; - private final ClassPath source; - private final FileObject sourceRoot; - - public CPCategorizer(FileObject file) { - this.boot = getClassPath(file, ClassPath.BOOT); - this.compile = getClassPath(file, ClassPath.COMPILE); - this.source = getClassPath(file, ClassPath.SOURCE); - this.sourceRoot = source != null ? source.findOwnerRoot(file) : null; - - StringBuilder cps = new StringBuilder(); - - if (boot != null) cps.append(boot.toString(PathConversionMode.PRINT)); - if (compile != null) cps.append(compile.toString(PathConversionMode.PRINT)); - if (source != null) cps.append(source.toString(PathConversionMode.PRINT)); - - this.cps = cps.toString(); - } - - @Override - public int hashCode() { - int hash = 5; - hash = 53 * hash + this.cps.hashCode(); - hash = 53 * hash + (this.sourceRoot != null ? this.sourceRoot.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final CPCategorizer other = (CPCategorizer) obj; - if (!this.cps.equals(other.cps)) { - return false; - } - if (this.sourceRoot != other.sourceRoot && (this.sourceRoot == null || !this.sourceRoot.equals(other.sourceRoot))) { - return false; - } - return true; - } - - } - - public static final String ENSURE_DEPENDENCY = "ensure-dependency"; - - public static boolean fixDependencies(FileObject file, Iterable toProcess, Map> alreadyProcessed) { - boolean modified = false; -// for (FileObject file : toProcess.keySet()) { - for (JavaFix fix : toProcess) { - String updateTo = Accessor.INSTANCE.getOptions(fix).get(ENSURE_DEPENDENCY); - - if (updateTo != null) { - Project p = FileOwnerQuery.getOwner(file); - - if (p != null) { - Set seen = alreadyProcessed.get(p); - - if (seen == null) { - alreadyProcessed.put(p, seen = new HashSet()); - } - - if (seen.add(updateTo)) { - for (ProjectDependencyUpgrader up : Lookup.getDefault().lookupAll(ProjectDependencyUpgrader.class)) { - if (up.ensureDependency(p, updateTo, false)) { //XXX: should check whether the given project was actually modified - modified = true; - break; - } - } - //TODO: fail if cannot update the dependency? - } - } - } - } - - return modified; -// } - } - - public static void recursive(FileObject root, FileObject file, Collection collected, ProgressHandleWrapper progress, int depth, Properties timeStamps, Set removedFiles, boolean recursive) { - if (!VisibilityQuery.getDefault().isVisible(file)) return; - - if (file.isData()) { - if (timeStamps != null) { - String relativePath = FileUtil.getRelativePath(root, file); - String lastModified = Long.toHexString(file.lastModified().getTime()); - - removedFiles.remove(relativePath); - - if (lastModified.equals(timeStamps.getProperty(relativePath))) { - return; - } - - timeStamps.setProperty(relativePath, lastModified); - } - - if (/*???:*/"java".equals(file.getExt()) || "text/x-java".equals(FileUtil.getMIMEType(file, "text/x-java"))) { - collected.add(file); - } - } else { - FileObject[] children = file.getChildren(); - - if (children.length == 0) return; - - ProgressHandleWrapper inner = depth < 2 ? progress.startNextPartWithEmbedding(ProgressHandleWrapper.prepareParts(children.length)) : null; - - if (inner == null && progress != null) { - progress.startNextPart(children.length); - } else { - progress = null; - } - - for (FileObject c : children) { - if (recursive || c.isData()) - recursive(root, c, collected, inner, depth + 1, timeStamps, removedFiles, recursive); - - if (progress != null) progress.tick(); - } - } - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/ProgressHandleWrapper.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/ProgressHandleWrapper.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,293 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2011 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl.batch; - -import java.util.Arrays; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.netbeans.api.progress.ProgressHandle; -import org.netbeans.modules.analysis.spi.Analyzer.Context; -import org.netbeans.modules.java.hints.spiimpl.Utilities; - -public final class ProgressHandleWrapper { - - private static final int TOTAL = 1000; - private final ProgressHandleAbstraction handle; - private final int[] parts; - private int currentPart = -1; - private int currentPartTotalWork; - private int currentPartWorkDone; - private long currentPartStartTime; - private int currentOffset; - private final long[] spentTime; - private boolean debug; - - public ProgressHandleWrapper(int... parts) { - this((ProgressHandleAbstraction) null, parts); - } - - public ProgressHandleWrapper(ProgressHandle handle, int... parts) { - this(new ProgressHandleBasedProgressHandleAbstraction(handle), parts); - } - - public ProgressHandleWrapper(Context handle, int... parts) { - this(new AnalysisContextBasedProgressHandleAbstraction(handle), parts); - } - - public ProgressHandleWrapper(ProgressHandleAbstraction handle, int... parts) { - this.handle = handle; - if (handle == null) { - this.parts = null; - this.spentTime = null; - } else { - int total = 0; - for (int i : parts) { - total += i; - } - this.parts = new int[parts.length]; - for (int cntr = 0; cntr < parts.length; cntr++) { - this.parts[cntr] = (TOTAL * parts[cntr]) / total; - } - this.spentTime = new long[parts.length]; - } - } - - public void setDebug(boolean debug) { - this.debug = debug; - } - - public void startNextPart(int totalWork) { - if (handle == null) { - return; - } - if (currentPart == (-1)) { - handle.start(TOTAL); - } else { - currentOffset += parts[currentPart]; - spentTime[currentPart] = System.currentTimeMillis() - currentPartStartTime; - } - currentPart++; - currentPartTotalWork = totalWork; - currentPartWorkDone = 0; - currentPartStartTime = System.currentTimeMillis(); - currentPartWorkDoneUpdated(); - } - - public ProgressHandleWrapper startNextPartWithEmbedding(int... embeddedParts) { -// startNextPart(TOTAL); - return new ProgressHandleWrapper(new ProgressHandleWrapperBasedProgressHandleAbstraction(this), embeddedParts); - } - - public void tick() { - if (handle == null) { - return; - } - currentPartWorkDone++; - currentPartWorkDoneUpdated(); - } - - private void setCurrentPartWorkDone(int done) { - if (handle == null) { - return; - } - currentPartWorkDone = done; - currentPartWorkDoneUpdated(); - } - - private void currentPartWorkDoneUpdated() { - if (currentPartTotalWork > 0) { - int parentProgress = currentOffset + (parts[currentPart] * currentPartWorkDone) / currentPartTotalWork; - if (debug) { - System.err.println("currentOffset=" + currentOffset); - System.err.println("currentPart=" + currentPart); - System.err.println("parts[currentPart]= " +parts[currentPart]); - System.err.println("currentPartWorkDone=" + currentPartWorkDone); - System.err.println("currentPartTotalWork= " +currentPartTotalWork); - System.err.println("parentProgress=" + parentProgress); - } - handle.progress(parentProgress); - } else { - handle.progress(currentOffset + parts[currentPart]); - } - setAutomatedMessage(); - } - - public void setMessage(String message) { - if (handle == null) { - return; - } - handle.progress(message); - } - - private void setAutomatedMessage() { - if (handle == null || currentPart == (-1)) { - return; - } - long spentTime = System.currentTimeMillis() - currentPartStartTime; - double timePerUnit = ((double) spentTime) / currentPartWorkDone; - String timeString; - if (spentTime > 0) { - double totalTime = currentPartTotalWork * timePerUnit; - timeString = Utilities.toHumanReadableTime(spentTime) + "/" + Utilities.toHumanReadableTime(totalTime); - } else { - timeString = "No estimate"; - } - handle.progress("Part " + (currentPart + 1) + "/" + parts.length + ", " + currentPartWorkDone + "/" + currentPartTotalWork + ", " + timeString); - } - - public void finish() { - if (handle == null) { - return ; - } - - handle.finish(); - - if (currentPart < 0) return ; - - spentTime[currentPart] = System.currentTimeMillis() - currentPartStartTime; - - double total = 0.0; - - for (long t : spentTime) { - total += t; - } - - double[] actualSplit = new double[spentTime.length]; - int i = 0; - - for (long t : spentTime) { - actualSplit[i++] = TOTAL * (t / total); - } - - Logger.getLogger(ProgressHandleWrapper.class.getName()).log(Level.FINE, "Progress handle with split: {0}, actual times: {1}, actual split: {2}", new Object[] {Arrays.toString(parts), Arrays.toString(spentTime), Arrays.toString(actualSplit)}); - } - - public static int[] prepareParts(int count) { - int[] result = new int[count]; - - for (int cntr = 0; cntr < count; cntr++) { - result[cntr] = 1; - } - - return result; - } - - public static interface ProgressHandleAbstraction { - - public void start(int totalWork); - - public void progress(int currentWorkDone); - - public void progress(String message); - - public void finish(); - - } - - private static final class ProgressHandleBasedProgressHandleAbstraction implements ProgressHandleAbstraction { - private final ProgressHandle delegate; - public ProgressHandleBasedProgressHandleAbstraction(ProgressHandle delegate) { - this.delegate = delegate; - } - - public void start(int totalWork) { - delegate.start(totalWork); - } - - public void progress(int currentWorkDone) { - delegate.progress(currentWorkDone); - } - - public void progress(String message) { - delegate.progress(message); - } - - public void finish() { - delegate.finish(); - } - } - - private static final class AnalysisContextBasedProgressHandleAbstraction implements ProgressHandleAbstraction { - private final Context delegate; - AnalysisContextBasedProgressHandleAbstraction(Context delegate) { - this.delegate = delegate; - } - - public void start(int totalWork) { - delegate.start(totalWork); - } - - public void progress(int currentWorkDone) { - delegate.progress(currentWorkDone); - } - - public void progress(String message) { - delegate.progress(message); - } - - public void finish() { - delegate.finish(); - } - } - - private static final class ProgressHandleWrapperBasedProgressHandleAbstraction implements ProgressHandleAbstraction { - private final ProgressHandleWrapper delegate; - public ProgressHandleWrapperBasedProgressHandleAbstraction(ProgressHandleWrapper delegate) { - this.delegate = delegate; - } - - public void start(int totalWork) { - delegate.startNextPart(totalWork); - } - - public void progress(int currentWorkDone) { - delegate.setCurrentPartWorkDone(currentWorkDone); - } - - public void progress(String message) { - delegate.setMessage(message); - } - - public void finish() {} - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/Scopes.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/Scopes.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,141 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2011 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl.batch; - -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.classpath.GlobalPathRegistry; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Folder; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.IndexEnquirer; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.MapIndices; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Scope; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import org.openide.filesystems.FileObject; -import org.openide.util.Lookup; - -/** - * - * @author lahvac - */ -public class Scopes { - - public static Scope allOpenedProjectsScope() { - return new AllOpenedProjectsScope(); - } - - private static final class AllOpenedProjectsScope extends Scope { - - @Override - public String getDisplayName() { - return "All Opened Projects"; - } - - @Override - public Collection getTodo() { - Set todo = new HashSet(); - - for (ClassPath source : GlobalPathRegistry.getDefault().getPaths(ClassPath.SOURCE)) { - todo.addAll(Arrays.asList(Folder.convert(source.getRoots()))); - } - - return todo; - } - - @Override - public MapIndices getIndexMapper(Iterable hints) { - return getDefaultIndicesMapper(); - } - } - - public static Scope specifiedFoldersScope(Folder... roots) { - return new SpecificFoldersScope(roots); - } - - private static final class SpecificFoldersScope extends Scope { - - private final Collection roots; - - public SpecificFoldersScope(Folder... roots) { - this.roots = Arrays.asList(roots); - } - - @Override - public String getDisplayName() { - return "Specified Root"; - } - - @Override - public Collection getTodo() { - return roots; - } - - @Override - public MapIndices getIndexMapper(Iterable hints) { - return getDefaultIndicesMapper(); - } - } - - public static MapIndices getDefaultIndicesMapper() { - return new MapIndices() { - @Override - public IndexEnquirer findIndex(FileObject root, ProgressHandleWrapper progress, boolean recursive) { - IndexEnquirer e = findIndexEnquirer(root, progress, recursive); - - if (e != null) return e; - else return new BatchSearch.FileSystemBasedIndexEnquirer(root, recursive); - } - }; - } - - public static IndexEnquirer findIndexEnquirer(FileObject root, ProgressHandleWrapper progress, boolean recursive) { - for (MapIndices mi : Lookup.getDefault().lookupAll(MapIndices.class)) { - IndexEnquirer r = mi.findIndex(root, progress, recursive); - - if (r != null) return r; - } - - return null; - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/GlobalProcessingContext.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/GlobalProcessingContext.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl.hints; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.spi.java.hints.Decision; - -/** - * - * @author lahvac - */ -public class GlobalProcessingContext { - public final Map>> decisions = new HashMap>>(); -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvoker.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvoker.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,863 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl.hints; - -import com.sun.source.tree.Tree; -import java.util.Stack; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.lang.model.element.AnnotationMirror; -import javax.lang.model.element.AnnotationValue; -import javax.lang.model.element.Element; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.TypeElement; -import javax.swing.text.Document; -import org.netbeans.api.java.source.support.CancellableTreePathScanner; -import org.netbeans.editor.GuardedDocument; -import org.netbeans.editor.MarkBlock; -import org.netbeans.editor.MarkBlockChain; -import org.openide.filesystems.FileObject; - -import com.sun.source.tree.Tree.Kind; -import com.sun.source.util.TreePath; -import com.sun.source.util.Trees; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.prefs.Preferences; -import javax.annotation.processing.ProcessingEnvironment; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; -import org.netbeans.api.annotations.common.CheckForNull; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.modules.java.hints.spiimpl.Hacks; -import org.netbeans.spi.java.hints.HintContext; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata; -import org.netbeans.modules.java.hints.providers.spi.Trigger; -import org.netbeans.modules.java.hints.providers.spi.Trigger.Kinds; -import org.netbeans.modules.java.hints.providers.spi.Trigger.PatternDescription; -import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings; -import org.netbeans.modules.java.hints.spiimpl.MessageImpl; -import org.netbeans.modules.java.hints.spiimpl.RulesManager; -import org.netbeans.modules.java.hints.spiimpl.SPIAccessor; -import org.netbeans.modules.java.hints.spiimpl.Utilities; -import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch; -import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch.BulkPattern; -import org.netbeans.modules.java.hints.spiimpl.pm.PatternCompiler; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.editor.hints.Severity; -import org.netbeans.spi.java.hints.Hint; -import org.netbeans.api.java.source.matching.Matcher; -import org.netbeans.api.java.source.matching.Occurrence; -import org.netbeans.api.java.source.matching.Pattern; -import org.netbeans.modules.java.hints.providers.spi.Trigger.DecisionTrigger; -import org.openide.util.Exceptions; - -/** - * - * @author lahvac - */ -public class HintsInvoker { - - private final Map timeLog = new HashMap(); - - private final HintsSettings settings; - private final int caret; - private final int from; - private final int to; - private final GlobalProcessingContext globalContext; - private final AtomicBoolean cancel; - - public HintsInvoker(HintsSettings settings, AtomicBoolean cancel) { - this(settings, null, cancel); - } - - public HintsInvoker(HintsSettings settings, GlobalProcessingContext globalContext, AtomicBoolean cancel) { - this(settings, -1, -1, -1, globalContext, cancel); - } - - public HintsInvoker(HintsSettings settings, int caret, AtomicBoolean cancel) { - this(settings, caret, -1, -1, null, cancel); - } - - public HintsInvoker(HintsSettings settings, int from, int to, AtomicBoolean cancel) { - this(settings, -1, from, to, null, cancel); - } - - private HintsInvoker(HintsSettings settings, int caret, int from, int to, GlobalProcessingContext globalContext, AtomicBoolean cancel) { - this.settings = settings; - this.caret = caret; - this.from = from; - this.to = to; - this.globalContext = globalContext; - this.cancel = cancel; - } - - @CheckForNull - public List computeHints(CompilationInfo info) { - return computeHints(info, new TreePath(info.getCompilationUnit())); - } - - private List computeHints(CompilationInfo info, TreePath startAt) { - List descs = new LinkedList(); - Map> allHints = RulesManager.getInstance().readHints(info, null, cancel); - - for (Entry> e : allHints.entrySet()) { - HintMetadata m = e.getKey(); - - if (!settings.isEnabled(m)) { - continue; - } - - if (caret != -1) { - if (m.kind == Hint.Kind.ACTION) { - descs.addAll(e.getValue()); - } else { - if (settings.getSeverity(m) == Severity.HINT) { - descs.addAll(e.getValue()); - } - } - } else { - if (m.kind == Hint.Kind.INSPECTION) { - if (settings.getSeverity(m) != Severity.HINT) { - descs.addAll(e.getValue()); - } - } - } - } - - List errors = join(computeHints(info, startAt, descs, new LinkedList())); - - dumpTimeSpentInHints(); - - return errors; - } - - @CheckForNull - public List computeHints(CompilationInfo info, - Iterable hints) { - return computeHints(info, hints, new LinkedList()); - } - - @CheckForNull - public List computeHints(CompilationInfo info, - Iterable hints, - Collection problems) { - return join(computeHints(info, new TreePath(info.getCompilationUnit()), hints, problems)); - } - - private static final Iterable> TRIGGER_KINDS = Arrays.asList(Kinds.class, PatternDescription.class, DecisionTrigger.class); - - @CheckForNull - public Map> computeHints(CompilationInfo info, - TreePath startAt, - Iterable hints, - Collection problems) { - return computeHints(info, startAt, true, hints, problems); - } - - @CheckForNull - public Map> computeHints(CompilationInfo info, - TreePath startAt, - boolean recursive, - Iterable hints, - Collection problems) { - Map> triggerKind2Hints = new HashMap>(); - - for (Class c : TRIGGER_KINDS) { - triggerKind2Hints.put(c, new ArrayList()); - } - - for (HintDescription hd : hints) { - List sorted = triggerKind2Hints.get(hd.getTrigger().getClass()); - - sorted.add(hd); - } - - if (caret != -1) { - TreePath tp = info.getTreeUtilities().pathFor(caret); - return computeSuggestions(info, tp, true, triggerKind2Hints, problems); - } else { - if (from != (-1) && to != (-1)) { - return computeHintsInSpan(info, triggerKind2Hints, problems); - } else if (!recursive) { - return computeSuggestions(info, startAt, false, triggerKind2Hints, problems); - } else { - return computeHintsImpl(info, startAt, triggerKind2Hints, problems); - } - } - } - - private Map> computeHintsImpl(CompilationInfo info, - TreePath startAt, - Map> triggerKind2Hints, - Collection problems) { - Map> errors = new HashMap>(); - List kindBasedHints = triggerKind2Hints.get(Kinds.class); - - timeLog.put("[C] Kind Based Hints", (long) kindBasedHints.size()); - - if (!kindBasedHints.isEmpty()) { - long kindStart = System.currentTimeMillis(); - - new ScannerImpl(info, cancel, sortByKinds(kindBasedHints), problems).scan(startAt, errors); - - long kindEnd = System.currentTimeMillis(); - - timeLog.put("Kind Based Hints", kindEnd - kindStart); - } - - if (cancel.get()) return null; - - List patternBasedHints = triggerKind2Hints.get(PatternDescription.class); - - timeLog.put("[C] Pattern Based Hints", (long) patternBasedHints.size()); - - long patternStart = System.currentTimeMillis(); - - Map> patternHints = sortByPatterns(patternBasedHints); - Map> patternTests = computePatternTests(patternHints); - - long bulkPatternStart = System.currentTimeMillis(); - - BulkPattern bulkPattern = BulkSearch.getDefault().create(info, cancel, patternTests.keySet()); - - if (bulkPattern == null || cancel.get()) return null; - - long bulkPatternEnd = System.currentTimeMillis(); - - timeLog.put("Bulk Pattern preparation", bulkPatternEnd - bulkPatternStart); - - long bulkStart = System.currentTimeMillis(); - - Map> occurringPatterns = BulkSearch.getDefault().match(info, cancel, startAt, bulkPattern, timeLog); - - if (occurringPatterns == null || cancel.get()) return null; - - long bulkEnd = System.currentTimeMillis(); - - timeLog.put("Bulk Search", bulkEnd - bulkStart); - - Map> computedHints = doComputeHints(info, occurringPatterns, patternTests, patternHints, problems); - - if (computedHints == null || cancel.get()) return null; - - mergeAll(errors, computedHints); - - long patternEnd = System.currentTimeMillis(); - - timeLog.put("Pattern Based Hints", patternEnd - patternStart); - - return errors; - } - - private Map> computeHintsInSpan(CompilationInfo info, - Map> triggerKind2Hints, - Collection problems) { - - TreePath path = info.getTreeUtilities().pathFor((from + to) / 2); - - while (path.getLeaf().getKind() != Kind.COMPILATION_UNIT) { - int start = (int) info.getTrees().getSourcePositions().getStartPosition(info.getCompilationUnit(), path.getLeaf()); - int end = (int) info.getTrees().getSourcePositions().getEndPosition(info.getCompilationUnit(), path.getLeaf()); - - if (start <= from && end >= to) { - break; - } - - path = path.getParentPath(); - } - - Map> errors = new HashMap>(); - List kindBasedHints = triggerKind2Hints.get(Kinds.class); - - if (!kindBasedHints.isEmpty()) { - long kindStart = System.currentTimeMillis(); - - new ScannerImpl(info, cancel, sortByKinds(kindBasedHints), problems).scan(path, errors); - - long kindEnd = System.currentTimeMillis(); - - timeLog.put("Kind Based Hints", kindEnd - kindStart); - } - - List patternBasedHints = triggerKind2Hints.get(PatternDescription.class); - - if (!patternBasedHints.isEmpty()) { - long patternStart = System.currentTimeMillis(); - - Map> patternHints = sortByPatterns(patternBasedHints); - Map> patternTests = computePatternTests(patternHints); - - long bulkStart = System.currentTimeMillis(); - - BulkPattern bulkPattern = BulkSearch.getDefault().create(info, cancel, patternTests.keySet()); - - if (bulkPattern == null || cancel.get()) return null; - - Map> occurringPatterns = BulkSearch.getDefault().match(info, cancel, path, bulkPattern, timeLog); - - long bulkEnd = System.currentTimeMillis(); - - timeLog.put("Bulk Search", bulkEnd - bulkStart); - - Map> computedHints = doComputeHints(info, occurringPatterns, patternTests, patternHints, problems); - - if (computedHints == null || cancel.get()) return null; - - mergeAll(errors, computedHints); - - long patternEnd = System.currentTimeMillis(); - - timeLog.put("Pattern Based Hints", patternEnd - patternStart); - } - - if (path != null) { - Map> suggestions = computeSuggestions(info, path, true, triggerKind2Hints, problems); - - if (suggestions == null || cancel.get()) return null; - - mergeAll(errors, suggestions); - } - - return errors; - } - - private Map> computeSuggestions(CompilationInfo info, - TreePath workOn, - boolean up, - Map> triggerKind2Hints, - Collection problems) { - Map> errors = new HashMap>(); - List kindBasedHints = triggerKind2Hints.get(Kinds.class); - - if (!kindBasedHints.isEmpty()) { - long kindStart = System.currentTimeMillis(); - - Map> hints = sortByKinds(kindBasedHints); - TreePath proc = workOn; - - while (proc != null) { - new ScannerImpl(info, cancel, hints, problems).scanDoNotGoDeeper(proc, errors); - if (!up) break; - proc = proc.getParentPath(); - } - - long kindEnd = System.currentTimeMillis(); - - timeLog.put("Kind Based Suggestions", kindEnd - kindStart); - } - - if (cancel.get()) return null; - - List patternBasedHints = triggerKind2Hints.get(PatternDescription.class); - - if (!patternBasedHints.isEmpty()) { - long patternStart = System.currentTimeMillis(); - - Map> patternHints = sortByPatterns(patternBasedHints); - Map> patternTests = computePatternTests(patternHints); - - //pretend that all the patterns occur on all treepaths from the current path - //up (probably faster than using BulkSearch over whole file) - //TODO: what about machint trees under the current path? - Set paths = new HashSet(); - - TreePath tp = workOn; - - while (tp != null) { - paths.add(tp); - if (!up) break; - tp = tp.getParentPath(); - } - - Map> occurringPatterns = new HashMap>(); - - for (String p : patternTests.keySet()) { - occurringPatterns.put(p, paths); - } - -// long bulkStart = System.currentTimeMillis(); -// -// BulkPattern bulkPattern = BulkSearch.getDefault().create(info, patternTests.keySet()); -// Map> occurringPatterns = BulkSearch.getDefault().match(info, new TreePath(info.getCompilationUnit()), bulkPattern, timeLog); -// -// long bulkEnd = System.currentTimeMillis(); -// -// Set acceptedLeafs = new HashSet(); -// -// TreePath tp = workOn; -// -// while (tp != null) { -// acceptedLeafs.add(tp.getLeaf()); -// tp = tp.getParentPath(); -// } -// -// for (Entry> e : occurringPatterns.entrySet()) { -// for (Iterator it = e.getValue().iterator(); it.hasNext(); ) { -// if (!acceptedLeafs.contains(it.next().getLeaf())) { -// it.remove(); -// } -// } -// } -// -// timeLog.put("Bulk Search", bulkEnd - bulkStart); - - Map> computed = doComputeHints(info, occurringPatterns, patternTests, patternHints, problems); - - if (computed == null || cancel.get()) return null; - - mergeAll(errors, computed); - - long patternEnd = System.currentTimeMillis(); - - timeLog.put("Pattern Based Hints", patternEnd - patternStart); - } - - return errors; - } - - public Map> doComputeHints(CompilationInfo info, Map> occurringPatterns, Map> patterns, Map> patternHints) throws IllegalStateException { - return doComputeHints(info, occurringPatterns, patterns, patternHints, new LinkedList()); - } - - private static Map> sortByKinds(List kindBasedHints) { - Map> result = new EnumMap>(Kind.class); - - for (HintDescription hd : kindBasedHints) { - for (Kind k : ((Kinds) hd.getTrigger()).getKinds()) { - List hints = result.get(k); - - if (hints == null) { - result.put(k, hints = new ArrayList()); - } - - hints.add(hd); - } - } - - return result; - } - - private static Map> sortByPatterns(List kindBasedHints) { - Map> result = new HashMap>(); - - for (HintDescription hd : kindBasedHints) { - List hints = result.get((PatternDescription) hd.getTrigger()); - - if (hints == null) { - result.put((PatternDescription) hd.getTrigger(), hints = new ArrayList()); - } - - hints.add(hd); - } - - return result; - } - - public static Map> computePatternTests(Map> patternHints) { - Map> patternTests = new HashMap>(); - for (Entry> e : patternHints.entrySet()) { - String p = e.getKey().getPattern(); - List descs = patternTests.get(p); - if (descs == null) { - patternTests.put(p, descs = new LinkedList()); - } - descs.add(e.getKey()); - } - return patternTests; - } - - private Map> doComputeHints(CompilationInfo info, Map> occurringPatterns, Map> patterns, Map> patternHints, Collection problems) throws IllegalStateException { - Map> errors = new HashMap>(); - - for (Entry> occ : occurringPatterns.entrySet()) { - PATTERN_LOOP: for (PatternDescription d : patterns.get(occ.getKey())) { - if (cancel.get()) return null; - - Map constraints = new HashMap(); - - for (Entry e : d.getConstraints().entrySet()) { - TypeMirror designedType = Hacks.parseFQNType(info, e.getValue()); - - if (designedType == null || designedType.getKind() == TypeKind.ERROR) { - //will not bind to anything anyway (#190449), skip pattern: - continue PATTERN_LOOP; - } - - constraints.put(e.getKey(), designedType); - } - - Pattern pattern = PatternCompiler.compile(info, occ.getKey(), constraints, d.getImports()); - - for (TreePath candidate : occ.getValue()) { - if (cancel.get()) return null; - - Iterator verified = Matcher.create(info).setCancel(cancel).setSearchRoot(candidate).setTreeTopSearch().match(pattern).iterator(); - - if (!verified.hasNext()) { - continue; - } - - Set suppressedWarnings = new HashSet(Utilities.findSuppressedWarnings(info, candidate)); - Occurrence verifiedVariables = verified.next(); - - for (HintDescription hd : patternHints.get(d)) { - HintMetadata hm = hd.getMetadata(); - HintContext c = SPIAccessor.getINSTANCE().createHintContext(info, settings, hm, globalContext != null ? globalContext : new GlobalProcessingContext(), candidate, verifiedVariables.getVariables(), verifiedVariables.getMultiVariables(), verifiedVariables.getVariables2Names(), constraints, problems, globalContext != null, cancel, caret); - - if (!Collections.disjoint(suppressedWarnings, hm.suppressWarnings)) - continue; - - Collection workerErrors = runHint(hd, c); - - if (workerErrors != null) { - merge(errors, hd, workerErrors); - } - } - } - } - } - - return errors; - } - -// public static void computeHints(URI file, ProcessingEnvironment env, CompilationUnitTree cut, RulesManager m) { -// Map hints = m.getKindBasedHints(); -// -// if (hints.isEmpty()) { -// return ; -// } -// -// List errors = new LinkedList(); -// -// File af = new File(file.getPath()); -// FileObject f = FileUtil.toFileObject(af); -// -// new ScannerImpl(f, env, hints).scan(cut, errors); -// -// for (ErrorDescription ed : errors) { -// Diagnostic.Kind k; -// -// switch (ed.getSeverity()) { -// case ERROR: -// k = Diagnostic.Kind.ERROR; -// break; -// default: -// k = Diagnostic.Kind.WARNING; -// break; -// } -// -// env.getMessager().printMessage(k, ed.getDescription()); -// } -// } - - public Map getTimeLog() { - return timeLog; - } - - private final class ScannerImpl extends CancellableTreePathScanner>> { - - private final Stack> suppresWarnings = new Stack>(); - private final CompilationInfo info; - private final FileObject file; - private final ProcessingEnvironment env; - private final Map> hints; - private final Collection problems; - - public ScannerImpl(CompilationInfo info, AtomicBoolean cancel, Map> hints, Collection problems) { - super(cancel); - this.info = info; - this.file = null; - this.env = null; - this.hints = hints; - this.problems = problems; - } - - public ScannerImpl(FileObject file, ProcessingEnvironment env, Map> hints, Collection problems) { - super(new AtomicBoolean()); - this.info = null; - this.file = file; - this.env = env; - this.hints = hints; - this.problems = problems; - } - - private void runAndAdd(TreePath path, List rules, Map> d) { - if (rules != null && !isInGuarded(info, path)) { - OUTER: for (HintDescription hd : rules) { - if (isCanceled()) { - return ; - } - - HintMetadata hm = hd.getMetadata(); - - for (String wname : hm.suppressWarnings) { - if( !suppresWarnings.empty() && suppresWarnings.peek().contains(wname)) { - continue OUTER; - } - } - - HintContext c = SPIAccessor.getINSTANCE().createHintContext(info, settings, hm, globalContext != null ? globalContext : new GlobalProcessingContext(), path, Collections.emptyMap(), Collections.>emptyMap(), Collections.emptyMap(), Collections.emptyMap(), new ArrayList(), globalContext != null, cancel, caret); - Collection errors = runHint(hd, c); - - if (errors != null) { - merge(d, hd, errors); - } - } - } - } - - @Override - public Void scan(Tree tree, Map> p) { - if (tree == null) - return null; - - TreePath tp = new TreePath(getCurrentPath(), tree); - Kind k = tree.getKind(); - - boolean b = pushSuppressWarrnings(tp); - try { - runAndAdd(tp, hints.get(k), p); - - if (isCanceled()) { - return null; - } - - return super.scan(tree, p); - } finally { - if (b) { - suppresWarnings.pop(); - } - } - } - - @Override - public Void scan(TreePath path, Map> p) { - Kind k = path.getLeaf().getKind(); - boolean b = pushSuppressWarrnings(path); - try { - runAndAdd(path, hints.get(k), p); - - if (isCanceled()) { - return null; - } - - return super.scan(path, p); - } finally { - if (b) { - suppresWarnings.pop(); - } - } - } - - public void scanDoNotGoDeeper(TreePath path, Map> p) { - Kind k = path.getLeaf().getKind(); - runAndAdd(path, hints.get(k), p); - } - - private boolean pushSuppressWarrnings(TreePath path) { - switch(path.getLeaf().getKind()) { - case ANNOTATION_TYPE: - case CLASS: - case ENUM: - case INTERFACE: - case METHOD: - case VARIABLE: - Set current = suppresWarnings.size() == 0 ? null : suppresWarnings.peek(); - Set nju = current == null ? new HashSet() : new HashSet(current); - - Element e = getTrees().getElement(path); - - if ( e != null) { - for (AnnotationMirror am : e.getAnnotationMirrors()) { - String name = ((TypeElement)am.getAnnotationType().asElement()).getQualifiedName().toString(); - if ( "java.lang.SuppressWarnings".equals(name) ) { // NOI18N - Map elementValues = am.getElementValues(); - for (Map.Entry entry : elementValues.entrySet()) { - if( "value".equals(entry.getKey().getSimpleName().toString()) ) { // NOI18N - Object value = entry.getValue().getValue(); - if ( value instanceof List) { - for (Object av : (List)value) { - if( av instanceof AnnotationValue ) { - Object wname = ((AnnotationValue)av).getValue(); - if ( wname instanceof String ) { - nju.add((String)wname); - } - } - } - } - } - } - } - } - } - - suppresWarnings.push(nju); - return true; - } - return false; - } - - private Trees getTrees() { - return info != null ? info.getTrees() : Trees.instance(env); - } - } - - static boolean isInGuarded(CompilationInfo info, TreePath tree) { - if (info == null) { - return false; - } - - try { - Document doc = info.getDocument(); - - if (doc instanceof GuardedDocument) { - int start = (int) info.getTrees().getSourcePositions().getStartPosition(info.getCompilationUnit(), tree.getLeaf()); - int end = (int) info.getTrees().getSourcePositions().getEndPosition(info.getCompilationUnit(), tree.getLeaf()); - GuardedDocument gdoc = (GuardedDocument) doc; - MarkBlockChain guardedBlockChain = gdoc.getGuardedBlockChain(); - if (guardedBlockChain.compareBlock(start, end) == MarkBlock.INNER) { - return true; - } - } - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - - return false; - } - - private Collection runHint(HintDescription hd, HintContext ctx) { - long start = System.nanoTime(); - - try { - return hd.getWorker().createErrors(ctx); - } finally { - long end = System.nanoTime(); - reportSpentTime(hd.getMetadata().id, end - start); - } - } - - public static Map> merge(Map> to, K key, Collection value) { - List toColl = to.get(key); - - if (toColl == null) { - to.put(key, toColl = new LinkedList()); - } - - toColl.addAll(value); - - return to; - } - - public static Map> mergeAll(Map> to, Map> what) { - for (Entry> e : what.entrySet()) { - List toColl = to.get(e.getKey()); - - if (toColl == null) { - to.put(e.getKey(), toColl = new LinkedList()); - } - - toColl.addAll(e.getValue()); - } - - return to; - } - - public static List join(Map> errors) { - if (errors == null) return null; - - List result = new LinkedList(); - - for (Entry> e : errors.entrySet()) { - result.addAll(e.getValue()); - } - - return result; - } - - private static final boolean logTimeSpentInHints = Boolean.getBoolean("java.HintsInvoker.time.in.hints"); - private final Map hint2SpentTime = new HashMap(); - - private void reportSpentTime(String id, long nanoTime) { - if (!logTimeSpentInHints) return; - - Long prev = hint2SpentTime.get(id); - - if (prev == null) { - prev = (long) 0; - } - - hint2SpentTime.put(id, prev + nanoTime); - } - - private void dumpTimeSpentInHints() { - if (!logTimeSpentInHints) return; - - List> l = new ArrayList>(hint2SpentTime.entrySet()); - - Collections.sort(l, new Comparator>() { - @Override - public int compare(Entry o1, Entry o2) { - return (int) Math.signum(o1.getValue() - o2.getValue()); - } - }); - - for (Entry e : l) { - System.err.println(e.getKey() + "=" + String.format("%3.2f", e.getValue() / 1000000.0)); - } - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsTask.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsTask.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,254 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl.hints; - -import java.util.List; -import java.util.Map.Entry; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import javax.swing.text.BadLocationException; -import javax.swing.text.Document; -import org.netbeans.api.editor.mimelookup.MimeLookup; -import org.netbeans.api.editor.mimelookup.MimeRegistration; -import org.netbeans.api.java.source.CancellableTask; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.JavaSource.Phase; -import org.netbeans.api.java.source.JavaSource.Priority; -import org.netbeans.api.java.source.JavaSourceTaskFactory; -import org.netbeans.api.java.source.support.CaretAwareJavaSourceTaskFactory; -import org.netbeans.api.java.source.support.EditorAwareJavaSourceTaskFactory; -import org.netbeans.editor.BaseDocument; -import org.netbeans.editor.Utilities; -import org.netbeans.lib.editor.util.swing.DocumentUtilities; -import org.netbeans.modules.java.hints.providers.spi.PositionRefresherHelper; -import org.netbeans.modules.java.hints.providers.spi.PositionRefresherHelper.DocumentVersion; -import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings; -import org.netbeans.modules.parsing.spi.TaskIndexingMode; -import org.netbeans.spi.editor.hints.Context; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.editor.hints.HintsController; -import org.netbeans.spi.editor.hints.Severity; -import org.netbeans.spi.editor.hints.settings.FileHintPreferences; -import org.openide.filesystems.FileObject; -import org.openide.util.WeakListeners; -import org.openide.util.lookup.ServiceProvider; - -/** - * - * @author lahvac - */ -public class HintsTask implements CancellableTask { - - public static final String KEY_HINTS = HintsInvoker.class.getName() + "-hints"; - public static final String KEY_SUGGESTIONS = HintsInvoker.class.getName() + "-suggestions"; - - private static final Logger TIMER = Logger.getLogger("TIMER"); - private static final Logger TIMER_EDITOR = Logger.getLogger("TIMER.editor"); - private static final Logger TIMER_CARET = Logger.getLogger("TIMER.caret"); - - private final AtomicBoolean cancel = new AtomicBoolean(); - - private final boolean caretAware; - - public HintsTask(boolean caretAware) { - this.caretAware = caretAware; - } - - public void run(CompilationInfo info) { - cancel.set(false); - - if (org.netbeans.modules.java.hints.spiimpl.Utilities.disableErrors(info.getFileObject()).contains(Severity.VERIFIER)) { - return; - } - - Document doc = info.getSnapshot().getSource().getDocument(false); - long version = doc != null ? DocumentUtilities.getDocumentVersion(doc) : 0; - long startTime = System.currentTimeMillis(); - - int caret = CaretAwareJavaSourceTaskFactory.getLastPosition(info.getFileObject()); - HintsSettings settings = HintsSettings.getSettingsFor(info.getFileObject()); - HintsInvoker inv = caretAware ? new HintsInvoker(settings, caret, cancel) : new HintsInvoker(settings, cancel); - List result = inv.computeHints(info); - - if (result == null || cancel.get()) { - return; - } - - HintsController.setErrors(info.getFileObject(), caretAware ? KEY_SUGGESTIONS : KEY_HINTS, result); - - if (caretAware) { - SuggestionsPositionRefresherHelper.setVersion(doc, caret); - } else { - HintPositionRefresherHelper.setVersion(doc); - } - - long endTime = System.currentTimeMillis(); - - TIMER.log(Level.FINE, "Jackpot 3.0 Hints Task" + (caretAware ? " - Caret Aware" : ""), new Object[] {info.getFileObject(), endTime - startTime}); - - Logger l = caretAware ? TIMER_CARET : TIMER_EDITOR; - - for (Entry e : inv.getTimeLog().entrySet()) { - l.log(Level.FINE, e.getKey(), new Object[] {info.getFileObject(), e.getValue()}); - } - } - - public void cancel() { - cancel.set(true); - } - - - @ServiceProvider(service=JavaSourceTaskFactory.class) - public static final class FactoryImpl extends EditorAwareJavaSourceTaskFactory implements ChangeListener { - - public FactoryImpl() { - super(Phase.RESOLVED, Priority.LOW, TaskIndexingMode.ALLOWED_DURING_SCAN); - FileHintPreferences.addChangeListener(WeakListeners.change(this, HintsSettings.class)); - } - - @Override - protected CancellableTask createTask(FileObject file) { - return new HintsTask(false); - } - - @Override - public void stateChanged(ChangeEvent e) { - for (FileObject file : getFileObjects()) { - reschedule(file); - } - } - - } - - @ServiceProvider(service=JavaSourceTaskFactory.class) - public static final class CaretFactoryImpl extends CaretAwareJavaSourceTaskFactory implements ChangeListener { - - public CaretFactoryImpl() { - super(Phase.RESOLVED, Priority.LOW); - FileHintPreferences.addChangeListener(WeakListeners.change(this, HintsSettings.class)); - } - - @Override - protected CancellableTask createTask(FileObject file) { - return new HintsTask(true); - } - - @Override - public void stateChanged(ChangeEvent e) { - for (FileObject file : getFileObjects()) { - reschedule(file); - } - } - - } - - @MimeRegistration(mimeType="text/x-java", service=PositionRefresherHelper.class) - public static final class HintPositionRefresherHelper extends PositionRefresherHelper { - - public HintPositionRefresherHelper() { - super(KEY_HINTS); - } - - @Override - protected boolean isUpToDate(Context context, Document doc, DocumentVersion oldVersion) { - return true; - } - - @Override - public List getErrorDescriptionsAt(CompilationInfo info, Context context, Document doc) throws BadLocationException { - int rowStart = Utilities.getRowStart((BaseDocument) doc, context.getPosition()); - int rowEnd = Utilities.getRowEnd((BaseDocument) doc, context.getPosition()); - - return new HintsInvoker(HintsSettings.getSettingsFor(info.getFileObject()), rowStart, rowEnd, context.getCancel()).computeHints(info); - } - - private static void setVersion(Document doc) { - for (PositionRefresherHelper h : MimeLookup.getLookup("text/x-java").lookupAll(PositionRefresherHelper.class)) { - if (h instanceof HintPositionRefresherHelper) { - ((HintPositionRefresherHelper) h).setVersion(doc, new DocumentVersion(doc)); - } - } - } - - } - - @MimeRegistration(mimeType="text/x-java", service=PositionRefresherHelper.class) - public static final class SuggestionsPositionRefresherHelper extends PositionRefresherHelper { - - public SuggestionsPositionRefresherHelper() { - super(KEY_SUGGESTIONS); - } - - @Override - protected boolean isUpToDate(Context context, Document doc, SuggestionsDocumentVersion oldVersion) { - return oldVersion.suggestionsCaret == context.getPosition(); - } - - @Override - public List getErrorDescriptionsAt(CompilationInfo info, Context context, Document doc) throws BadLocationException { - return new HintsInvoker(HintsSettings.getSettingsFor(info.getFileObject()), context.getPosition(), context.getCancel()).computeHints(info); - } - - private static void setVersion(Document doc, int caret) { - for (PositionRefresherHelper h : MimeLookup.getLookup("text/x-java").lookupAll(PositionRefresherHelper.class)) { - if (h instanceof SuggestionsPositionRefresherHelper) { - ((SuggestionsPositionRefresherHelper) h).setVersion(doc, new SuggestionsDocumentVersion(doc, caret)); - } - } - } - } - - private static class SuggestionsDocumentVersion extends DocumentVersion { - - private final int suggestionsCaret; - - public SuggestionsDocumentVersion(Document doc, int suggestionsCaret) { - super(doc); - this.suggestionsCaret = suggestionsCaret; - } - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/ipi/upgrade/ProjectDependencyUpgrader.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/ipi/upgrade/ProjectDependencyUpgrader.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2010 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl.ipi.upgrade; - -import org.netbeans.api.project.Project; -import org.openide.DialogDisplayer; -import org.openide.NotifyDescriptor; -import org.openide.filesystems.FileObject; -import org.openide.modules.SpecificationVersion; - -/** - * - * @author lahvac - */ -public abstract class ProjectDependencyUpgrader { - - public abstract boolean ensureDependency(Project p, FileObject dep, SpecificationVersion spec, boolean canShowUI); - public abstract boolean ensureDependency(Project p, String specification, boolean b); - - protected final boolean showDependencyUpgradeDialog(Project p, String dep, SpecificationVersion currentDependency, SpecificationVersion spec, boolean newDepenency, boolean canShowUI) { - if (!canShowUI) return true; - - NotifyDescriptor nd = new NotifyDescriptor.Confirmation("New version: " + spec, "Update spec version.", NotifyDescriptor.YES_NO_OPTION); - - return DialogDisplayer.getDefault().notify(nd) == NotifyDescriptor.YES_OPTION; - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/options/HintsSettings.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/options/HintsSettings.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,149 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): - * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2010 Sun - * Microsystems, Inc. All Rights Reserved. - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - */ -package org.netbeans.modules.java.hints.spiimpl.options; - -import java.util.prefs.Preferences; -import org.netbeans.api.editor.mimelookup.MimeRegistration; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata; -import org.netbeans.spi.editor.hints.Severity; -import org.netbeans.spi.editor.hints.settings.FileHintPreferences; -import org.netbeans.spi.editor.hints.settings.FileHintPreferences.GlobalHintPreferencesProvider; -import org.openide.filesystems.FileObject; -import org.openide.util.NbPreferences; - -/** - * - * @author Petr Hrebejk - * @author Jan Lahoda - */ -public abstract class HintsSettings { - - private static final String ENABLED_KEY = "enabled"; // NOI18N - private static final String OLD_SEVERITY_KEY = "severity"; // NOI18N - private static final String NEW_SEVERITY_KEY = "hintSeverity"; // NOI18N -// protected static final String IN_TASK_LIST_KEY = "inTaskList"; // NOI18N - - public abstract boolean isEnabled(HintMetadata hint); - public abstract void setEnabled(HintMetadata hint, boolean value); - public abstract Preferences getHintPreferences(HintMetadata hint); - public abstract Severity getSeverity(HintMetadata hint); - public abstract void setSeverity(HintMetadata hint, Severity severity); -// public abstract Iterable getEnabledHints(); - - private static final class PreferencesBasedHintsSettings extends HintsSettings { - - private final Preferences preferences; - private final boolean useDefaultEnabled; - private final Severity overrideSeverity; - - public PreferencesBasedHintsSettings(Preferences preferences, boolean useDefaultEnabled, Severity overrideSeverity) { - this.preferences = preferences; - this.useDefaultEnabled = useDefaultEnabled; - this.overrideSeverity = overrideSeverity; - } - - @Override - public boolean isEnabled(HintMetadata hint) { - return getHintPreferences(hint).getBoolean(ENABLED_KEY, useDefaultEnabled && hint.enabled); - } - - @Override - public void setEnabled(HintMetadata hint, boolean value) { - getHintPreferences(hint).putBoolean(ENABLED_KEY, value); - } - - @Override - public Preferences getHintPreferences(HintMetadata hint) { - return preferences.node(hint.id); - } - - @Override - public Severity getSeverity(HintMetadata hint) { - Preferences prefs = getHintPreferences(hint); - String s = prefs.get(NEW_SEVERITY_KEY, null); - if (s != null) return Severity.valueOf(s); - - s = prefs.get(OLD_SEVERITY_KEY, null); - - if (s == null) return overrideSeverity != null ? overrideSeverity : hint != null ? hint.severity : null; - - if ("ERROR".equals(s)) return Severity.ERROR; - else if ("WARNING".equals(s)) return Severity.VERIFIER; - else if ("CURRENT_LINE_WARNING".equals(s)) return Severity.HINT; - - return overrideSeverity != null ? overrideSeverity : hint != null ? hint.severity : null; - } - - @Override - public void setSeverity(HintMetadata hint, Severity severity) { - getHintPreferences(hint).put(NEW_SEVERITY_KEY, severity.name()); - } - } - - public static HintsSettings createPreferencesBasedHintsSettings(Preferences preferences, boolean useDefaultEnabled, Severity overrideSeverity) { - return new PreferencesBasedHintsSettings(preferences, useDefaultEnabled, overrideSeverity); - } - - public static HintsSettings getSettingsFor(FileObject file) { - return createPreferencesBasedHintsSettings(FileHintPreferences.getFilePreferences(file, "text/x-java"), true, null); - } - - public static HintsSettings getGlobalSettings() { - return GLOBAL_SETTINGS; - } - - private static final String DEFAULT_PROFILE = "default"; // NOI18N - private static final String PREFERENCES_LOCATION = "org/netbeans/modules/java/hints"; - private static final HintsSettings GLOBAL_SETTINGS = createPreferencesBasedHintsSettings(NbPreferences.root().node(PREFERENCES_LOCATION).node(DEFAULT_PROFILE), true, null); - - @MimeRegistration(mimeType="text/x-java", service=GlobalHintPreferencesProvider.class) - public static class GlobalSettingsProvider implements GlobalHintPreferencesProvider { - - @Override - public Preferences getGlobalPreferences() { - return NbPreferences.root().node(PREFERENCES_LOCATION).node(DEFAULT_PROFILE); - } - - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/BulkSearch.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/BulkSearch.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,190 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl.pm; - -import com.sun.source.tree.Tree; -import com.sun.source.util.TreePath; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.Arrays; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; -import org.netbeans.api.annotations.common.CheckForNull; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.modules.java.hints.spiimpl.Utilities; -import org.netbeans.modules.java.hints.providers.spi.HintDescription.AdditionalQueryConstraints; - -/** - * - * @author lahvac - */ -public abstract class BulkSearch { - - private static final BulkSearch INSTANCE = new NFABasedBulkSearch(); -// private static final BulkSearch INSTANCE = new REBasedBulkSearch(); - - public static BulkSearch getDefault() { - return INSTANCE; - } - - private final boolean requiresLightweightVerification; - - protected BulkSearch(boolean requiresLightweightVerification) { - this.requiresLightweightVerification = requiresLightweightVerification; - } - - public final Map> match(CompilationInfo info, AtomicBoolean cancel, TreePath toSearch, BulkPattern pattern) { - return match(info, cancel, toSearch, pattern, null); - } - - public final boolean requiresLightweightVerification() { - return requiresLightweightVerification; - } - - @CheckForNull - public abstract Map> match(CompilationInfo info, AtomicBoolean cancel, TreePath toSearch, BulkPattern pattern, Map timeLog); - - public abstract boolean matches(InputStream encoded, AtomicBoolean cancel, BulkPattern pattern); - - @CheckForNull - public abstract Map matchesWithFrequencies(InputStream encoded, BulkPattern pattern, AtomicBoolean cancel); - - public abstract boolean matches(CompilationInfo info, AtomicBoolean cancel, TreePath toSearch, BulkPattern pattern); - - public abstract void encode(Tree tree, EncodingContext ctx, AtomicBoolean cancel); - - @CheckForNull - public final BulkPattern create(CompilationInfo info, AtomicBoolean cancel, String... code) { - return create(info, cancel, Arrays.asList(code)); - } - - @CheckForNull - public final BulkPattern create(CompilationInfo info, AtomicBoolean cancel, Collection code) { - List patterns = new LinkedList(); - List additionalConstraints = new LinkedList(); - - for (String c : code) { - patterns.add(Utilities.parseAndAttribute(info, c, null)); - additionalConstraints.add(AdditionalQueryConstraints.empty()); - } - - return create(code, patterns, additionalConstraints, cancel); - } - - @CheckForNull - public abstract BulkPattern create(Collection code, Collection patterns, Collection additionalConstraints, AtomicBoolean cancel); - - public static abstract class BulkPattern { - - private final List patterns; - private final List> identifiers; - private final List>> requiredContent; - private final List additionalConstraints; - - public BulkPattern(List patterns, List> identifiers, List>> requiredContent, List additionalConstraints) { - this.patterns = patterns; - this.identifiers = identifiers;//TODO: immutable, maybe clone - this.requiredContent = requiredContent; - this.additionalConstraints = additionalConstraints; - } - - public List getPatterns() { - return patterns; - } - - public List> getIdentifiers() { - return identifiers; - } - - public List>> getRequiredContent() { - return requiredContent; - } - - public List getAdditionalConstraints() { - return additionalConstraints; - } - - } - - public static final class EncodingContext { - - private final OutputStream out; - private final boolean forDuplicates; - private Set identifiers; - private List content; - - public EncodingContext(OutputStream out, boolean forDuplicates) { - this.out = out; - this.forDuplicates = forDuplicates; - } - - public Set getIdentifiers() { - return identifiers; - } - - public OutputStream getOut() { - return out; - } - - public boolean isForDuplicates() { - return forDuplicates; - } - - public void setIdentifiers(Set identifiers) { - this.identifiers = identifiers; - } - - public void setContent(List content) { - this.content = content; - } - - public List getContent() { - return content; - } - - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/CopyFinderBasedBulkSearch.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/CopyFinderBasedBulkSearch.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,141 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl.pm; - -import com.sun.source.tree.Tree; -import com.sun.source.util.TreePath; -import java.io.InputStream; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.lang.model.type.TypeMirror; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.modules.java.hints.providers.spi.HintDescription.AdditionalQueryConstraints; -import org.netbeans.api.java.source.matching.Matcher; -import org.netbeans.api.java.source.matching.Occurrence; -import org.netbeans.api.java.source.matching.Pattern; -import org.openide.util.Parameters; - -/** - * - * @author lahvac - */ -public class CopyFinderBasedBulkSearch extends BulkSearch { - - public CopyFinderBasedBulkSearch() { - super(false); - } - - @Override - public Map> match(CompilationInfo info, AtomicBoolean cancel, TreePath toSearch, BulkPattern pattern, Map timeLog) { - Parameters.notNull("info", info); - Map> result = new HashMap>(); - TreePath topLevel = new TreePath(info.getCompilationUnit()); - - for (Entry e : ((BulkPatternImpl) pattern).pattern2Code.entrySet()) { - for (Occurrence od : Matcher.create(info).setCancel(new AtomicBoolean()).setUntypedMatching().setCancel(cancel).match(Pattern.createPatternWithFreeVariables(new TreePath(topLevel, e.getKey()), Collections.emptyMap()))) { - Collection c = result.get(e.getValue()); - - if (c == null) { - result.put(e.getValue(), c = new LinkedList()); - } - - c.add(od.getOccurrenceRoot()); - } - } - - return result; - } - - @Override - public boolean matches(CompilationInfo info, AtomicBoolean cancel, TreePath toSearch, BulkPattern pattern) { - //XXX: performance - return !match(info, cancel, toSearch, pattern).isEmpty(); - } - - @Override - public BulkPattern create(Collection code, Collection patterns, Collection additionalConstraints, AtomicBoolean cancel) { - Map pattern2Code = new HashMap(); - - Iterator itCode = code.iterator(); - Iterator itPatt = patterns.iterator(); - - while (itCode.hasNext() && itPatt.hasNext()) { - pattern2Code.put(itPatt.next(), itCode.next()); - } - - return new BulkPatternImpl(additionalConstraints, pattern2Code); - } - - @Override - public boolean matches(InputStream encoded, AtomicBoolean cancel, BulkPattern pattern) { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void encode(Tree tree, EncodingContext ctx, AtomicBoolean cancel) { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Map matchesWithFrequencies(InputStream encoded, BulkPattern pattern, AtomicBoolean cancel) { - throw new UnsupportedOperationException("Not supported yet."); - } - - private static final class BulkPatternImpl extends BulkPattern { - - private final Map pattern2Code; - - public BulkPatternImpl(Collection additionalConstraints, Map pattern2Code) { - super(new LinkedList(pattern2Code.values()), null, null, new LinkedList(additionalConstraints)); - this.pattern2Code = pattern2Code; - } - - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/NFA.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/NFA.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,216 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl.pm; - -import java.util.BitSet; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -/** - * - * @author lahvac - */ -public class NFA { - - /*XXX: private*/ final int stateCount; - private final int startingState; - private final Set inputs; - private final Map, State> transitionTable; - private final Map finalStates; - - private final State startingStateObject; - - private NFA(int startingState, int stateCount, Set inputs, Map, State> transitionTable, Map finalStates) { - this.startingState = startingState; - this.stateCount = stateCount; - this.inputs = inputs; - this.transitionTable = transitionTable; - this.finalStates = finalStates; - - startingStateObject = State.create().mutableOr(startingState); - } - - public State getStartingState() { - return startingStateObject; - } - - public State transition(final State active, final I input) { - State result = null; - -// for (int i : active) { - for (int i = active.nextSetBit(0); i >= 0; i = active.nextSetBit(i+1)) { - State target = transitionTable.get(Key.create(i, input)); - - if (target != null) { - if (result == null) { - result = State.create(); - } - - result.mutableOr(target); - } - } - - State r; - - //XXX: - if (result == null) { - r = startingStateObject; - } else { - r = result.mutableOr(startingState);//??? - } - - return r; - } - - public Set getResults(State bs) { - Set result = new HashSet(); - - for (int i = bs.nextSetBit(0); i >= 0; i = bs.nextSetBit(i+1)) { - if (finalStates.get(i) != null) { - result.add(finalStates.get(i)); - } - } - - return result; - } - - public static NFA create(int startingState, int stateCount, Set inputs, Map, State> transitionTable, Map finalStates) { - return new NFA(startingState, stateCount, inputs, transitionTable, finalStates); - } - - public State join(State s1, State s2) { - State bs = State.create(); - - bs.mutableOr(s1); - bs.mutableOr(s2); - - return bs; - } - - public static final class Key { - private final int state; - private final I input; - - private Key(int state, I input) { - this.state = state; - this.input = input; - } - - public static Key create(int state, I input) { - return new Key(state, input); - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final Key other = (Key) obj; - if (this.state != other.state) { - return false; - } - if (this.input != other.input && (this.input == null || !this.input.equals(other.input))) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 3; - hash = 83 * hash + this.state; - hash = 83 * hash + (this.input != null ? this.input.hashCode() : 0); - return hash; - } - - @Override - public String toString() { - return "[" + state + ", " + input + "]"; - } - - } - -// public static final class State extends HashSet { -// private State() { -// } -// -// public static State create() { -// return new State(); -// } -// -// public State mutableOr(int state) { -// add(state); -// return this; -// } -// -// public State mutableOr(State or) { -// addAll(or); -// return this; -// } -// -// } - - public static final class State extends BitSet { - private State() {} - - public static State create() { - return new State(); - } - - public State mutableOr(int state) { - set(state); - return this; - } - - public State mutableOr(State or) { - or(or); - return this; - } - - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/NFABasedBulkSearch.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/NFABasedBulkSearch.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,826 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl.pm; - -import com.sun.source.tree.AnnotationTree; -import com.sun.source.tree.BlockTree; -import com.sun.source.tree.ClassTree; -import com.sun.source.tree.IdentifierTree; -import com.sun.source.tree.LiteralTree; -import com.sun.source.tree.MemberSelectTree; -import com.sun.source.tree.MethodTree; -import com.sun.source.tree.ModifiersTree; -import com.sun.source.tree.StatementTree; -import com.sun.source.tree.Tree; -import com.sun.source.tree.Tree.Kind; -import com.sun.source.tree.VariableTree; -import com.sun.source.util.TreePath; -import com.sun.source.util.TreeScanner; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumMap; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.Stack; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.lang.model.element.Name; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.support.CancellableTreeScanner; -import org.netbeans.modules.java.hints.spiimpl.Utilities; -import org.netbeans.modules.java.hints.providers.spi.HintDescription.AdditionalQueryConstraints; -import org.openide.util.Exceptions; - -/** - * - * @author lahvac - */ -public class NFABasedBulkSearch extends BulkSearch { - - public NFABasedBulkSearch() { - super(false); - } - - @Override - public Map> match(CompilationInfo info, final AtomicBoolean cancel, TreePath tree, BulkPattern patternIn, Map timeLog) { - BulkPatternImpl pattern = (BulkPatternImpl) patternIn; - - final Map> occurringPatterns = new HashMap>(); - final NFA nfa = pattern.toNFA(); - final Set identifiers = new HashSet(); - - new CollectIdentifiers(identifiers, cancel) { - private NFA.State active = nfa.getStartingState(); - @Override - public Void scan(Tree node, TreePath p) { - if (node == null) { - return null; - } - - TreePath currentPath = new TreePath(p, node); - boolean[] goDeeper = new boolean[1]; - final NFA.State newActiveAfterVariable = nfa.transition(active, new Input(Kind.IDENTIFIER, "$", false)); - Input normalizedInput = normalizeInput(node, goDeeper, null); - boolean ignoreKind = normalizedInput.kind == Kind.IDENTIFIER || normalizedInput.kind == Kind.MEMBER_SELECT; - - NFA.State newActiveBefore = nfa.transition(active, normalizedInput); - - if (normalizedInput.name != null && !ignoreKind) { - newActiveBefore = nfa.join(newActiveBefore, nfa.transition(active, new Input(normalizedInput.kind, "$", false))); - } - - active = newActiveBefore; - - if (goDeeper[0]) { - super.scan(node, currentPath); - } else { - new CollectIdentifiers(identifiers, cancel).scan(node, null); - } - - if (cancel.get()) return null; - - NFA.State newActiveAfter = nfa.transition(active, UP); - - active = nfa.join(newActiveAfter, nfa.transition(newActiveAfterVariable, UP)); - - for (Res r : nfa.getResults(active)) { - addOccurrence(r, currentPath); - } - - return null; - } - - @Override - public Void scan(Iterable nodes, TreePath p) { - active = nfa.transition(active, new Input(Kind.IDENTIFIER, "(", false)); - try { - return super.scan(nodes, p); - } finally { - active = nfa.transition(active, UP); - } - } - - private void addOccurrence(Res r, TreePath currentPath) { - Collection occurrences = occurringPatterns.get(r); - if (occurrences == null) { - occurringPatterns.put(r, occurrences = new LinkedList()); - } - occurrences.add(currentPath); - } - }.scan(tree, tree.getParentPath()); - - if (cancel.get()) return null; - - Map> result = new HashMap>(); - - for (Entry> e : occurringPatterns.entrySet()) { - if (cancel.get()) return null; - if (!identifiers.containsAll(pattern.getIdentifiers().get(e.getKey().patternIndex))) { - continue; - } - - result.put(e.getKey().pattern, e.getValue()); - } - - return result; - } - - @Override - public BulkPattern create(Collection code, Collection patterns, Collection additionalConstraints, final AtomicBoolean cancel) { - int startState = 0; - final int[] nextState = new int[] {1}; - final Map, NFA.State> transitionTable = new LinkedHashMap, NFA.State>(); - Map finalStates = new HashMap(); - List> identifiers = new LinkedList>(); - List>> requiredContent = new ArrayList>>(); - Iterator codeIt = code.iterator(); - int patternIndex = 0; - - for (final Tree pattern : patterns) { - final int[] currentState = new int[] {startState}; - final Set patternIdentifiers = new HashSet(); - final List> content = new ArrayList>(); - - identifiers.add(patternIdentifiers); - requiredContent.add(content); - - class Scanner extends CollectIdentifiers { - public Scanner() { - super(patternIdentifiers, cancel); - } - private boolean auxPath; - private List currentContent; - { - content.add(currentContent = new ArrayList()); - } - @Override - public Void scan(Tree t, Void v) { - if (t == null) { - return null; - } - - if (Utilities.isMultistatementWildcardTree(t) || multiModifiers(t)) { - int target = nextState[0]++; - - setBit(transitionTable, NFA.Key.create(currentState[0], new Input(Kind.IDENTIFIER, "$", false)), target); - setBit(transitionTable, NFA.Key.create(target, UP), currentState[0]); - - content.add(currentContent = new ArrayList()); - - return null; - } - - if (t.getKind() == Kind.BLOCK) { - StatementTree singletonStatement = null; - BlockTree bt = (BlockTree) t; - - if (!bt.isStatic()) { - switch (bt.getStatements().size()) { - case 1: - singletonStatement = bt.getStatements().get(0); - break; - case 2: - if (Utilities.isMultistatementWildcardTree(bt.getStatements().get(0))) { - singletonStatement = bt.getStatements().get(1); - } else { - if (Utilities.isMultistatementWildcardTree(bt.getStatements().get(1))) { - singletonStatement = bt.getStatements().get(0); - } - } - break; - case 3: - if (Utilities.isMultistatementWildcardTree(bt.getStatements().get(0)) && Utilities.isMultistatementWildcardTree(bt.getStatements().get(2))) { - singletonStatement = bt.getStatements().get(1); - } - break; - } - } - - if (singletonStatement != null) { - int backup = currentState[0]; - - boolean oldAuxPath = auxPath; - - auxPath = true; - - scan(singletonStatement, null); - - auxPath = oldAuxPath; - - int target = currentState[0]; - - setBit(transitionTable, NFA.Key.create(backup, new Input(Kind.BLOCK, null, false)), currentState[0] = nextState[0]++); - setBit(transitionTable, NFA.Key.create(currentState[0], new Input(Kind.IDENTIFIER, "(", false)), currentState[0] = nextState[0]++); - - for (StatementTree st : bt.getStatements()) { - scan(st, null); - } - - setBit(transitionTable, NFA.Key.create(currentState[0], UP), currentState[0] = nextState[0]++); - setBit(transitionTable, NFA.Key.create(currentState[0], UP), target); - currentState[0] = target; - - return null; - } - } - - boolean[] goDeeper = new boolean[1]; - Input[] bypass = new Input[1]; - Input i = normalizeInput(t, goDeeper, bypass); - - if (!TO_IGNORE.contains(i.kind) && !auxPath) { - currentContent.add(kind2EncodedString.get(i.kind)); - } - - if (i.name != null && !auxPath) { - if (!"$".equals(i.name)) { - if (isIdentifierAcceptable(i.name)) { - currentContent.add(i.name); - } - if (Utilities.isPureMemberSelect(t, false)) { - content.add(currentContent = new ArrayList()); - } - } else { - content.add(currentContent = new ArrayList()); - } - } - - int backup = currentState[0]; - - handleTree(i, goDeeper, t, bypass); - - boolean oldAuxPath = auxPath; - - auxPath = true; - - if (StatementTree.class.isAssignableFrom(t.getKind().asInterface()) && t != pattern) { - int target = currentState[0]; - - setBit(transitionTable, NFA.Key.create(backup, new Input(Kind.BLOCK, null, false)), currentState[0] = nextState[0]++); - setBit(transitionTable, NFA.Key.create(currentState[0], new Input(Kind.IDENTIFIER, "(", false)), currentState[0] = nextState[0]++); - handleTree(i, goDeeper, t, bypass); - setBit(transitionTable, NFA.Key.create(currentState[0], UP), currentState[0] = nextState[0]++); - setBit(transitionTable, NFA.Key.create(currentState[0], UP), target); - currentState[0] = target; - } - - auxPath = oldAuxPath; - - return null; - } - - @Override - public Void scan(Iterable nodes, Void p) { - setBit(transitionTable, NFA.Key.create(currentState[0], new Input(Kind.IDENTIFIER, "(", false)), currentState[0] = nextState[0]++); - try { - return super.scan(nodes, p); - } finally { - setBit(transitionTable, NFA.Key.create(currentState[0], UP), currentState[0] = nextState[0]++); - } - } - - private void handleTree(Input i, boolean[] goDeeper, Tree t, Input[] bypass) { - int backup = currentState[0]; - int target = nextState[0]++; - - setBit(transitionTable, NFA.Key.create(backup, i), currentState[0] = nextState[0]++); - - if (goDeeper[0]) { - super.scan(t, null); - } else { - new CollectIdentifiers(patternIdentifiers, cancel).scan(t, null); - int aux = nextState[0]++; - setBit(transitionTable, NFA.Key.create(backup, new Input(Kind.MEMBER_SELECT, i.name, false)), aux); - setBit(transitionTable, NFA.Key.create(aux, new Input(Kind.IDENTIFIER, "$", false)), aux = nextState[0]++); - setBit(transitionTable, NFA.Key.create(aux, UP), aux = nextState[0]++); - setBit(transitionTable, NFA.Key.create(aux, UP), target); - } - - setBit(transitionTable, NFA.Key.create(currentState[0], UP), target); - - if (bypass[0] != null) { - int intermediate = nextState[0]++; - - setBit(transitionTable, NFA.Key.create(backup, bypass[0]), intermediate); - setBit(transitionTable, NFA.Key.create(intermediate, UP), target); - } - - currentState[0] = target; - } - } - - Scanner s = new Scanner(); - - s.scan(pattern, null); - - finalStates.put(currentState[0], new Res(codeIt.next(), patternIndex++)); - } - - if (cancel.get()) return null; - - NFA nfa = NFA.create(startState, nextState[0], null, transitionTable, finalStates); - - return new BulkPatternImpl(new LinkedList(code), identifiers, requiredContent, new LinkedList(additionalConstraints), nfa); - } - - private static void setBit(Map, NFA.State> transitionTable, NFA.Key input, int state) { - NFA.State target = transitionTable.get(input); - - if (target == null) { - transitionTable.put(input, target = NFA.State.create()); - } - - target.mutableOr(state); - } - - private static Input normalizeInput(Tree t, boolean[] goDeeper, Input[] bypass) { - if (t.getKind() == Kind.IDENTIFIER && ((IdentifierTree) t).getName().toString().startsWith("$")) { - goDeeper[0] = false; - return new Input(Kind.IDENTIFIER, "$", false); - } - - if (Utilities.getWildcardTreeName(t) != null) { - goDeeper[0] = false; - return new Input(Kind.IDENTIFIER, "$", false); - } - - if (t.getKind() == Kind.IDENTIFIER) { - goDeeper[0] = false; - String name = ((IdentifierTree) t).getName().toString(); - return new Input(Kind.IDENTIFIER, name, false); - } - - if (t.getKind() == Kind.MEMBER_SELECT) { - String name = ((MemberSelectTree) t).getIdentifier().toString(); - if (name.startsWith("$")) { - goDeeper[0] = false;//??? - return new Input(Kind.IDENTIFIER, "$", false); - } - if (bypass != null && Utilities.isPureMemberSelect(t, true)) { - bypass[0] = new Input(Kind.IDENTIFIER, name, false); - } - goDeeper[0] = true; - return new Input(Kind.MEMBER_SELECT, name, false); - } - - goDeeper[0] = true; - - String name; - - switch (t.getKind()) { - case CLASS: name = ((ClassTree)t).getSimpleName().toString(); break; - case VARIABLE: name = ((VariableTree)t).getName().toString(); break; - case METHOD: name = ((MethodTree)t).getName().toString(); break; - case BOOLEAN_LITERAL: name = ((LiteralTree) t).getValue().toString(); break; - default: name = null; - } - - if (name != null) { - if (!name.isEmpty() && name.charAt(0) == '$') { - name = "$"; - } - } - return new Input(t.getKind(), name, false); - } - - private boolean multiModifiers(Tree t) { - if (t.getKind() != Kind.MODIFIERS) return false; - - List annotations = new ArrayList(((ModifiersTree) t).getAnnotations()); - - return !annotations.isEmpty() && annotations.get(0).getAnnotationType().getKind() == Kind.IDENTIFIER; - } - - @Override - public boolean matches(CompilationInfo info, AtomicBoolean cancel, TreePath tree, BulkPattern pattern) { - //XXX: performance - return !match(info, cancel, tree, pattern).isEmpty(); - } - - private static final Set TO_IGNORE = EnumSet.of(Kind.BLOCK, Kind.IDENTIFIER, Kind.MEMBER_SELECT); - - @Override - public void encode(Tree tree, final EncodingContext ctx, AtomicBoolean cancel) { - final Set identifiers = new HashSet(); - final List content = new ArrayList(); - if (!ctx.isForDuplicates()) { - new CollectIdentifiers(identifiers, cancel).scan(tree, null); - try { - int size = identifiers.size(); - ctx.getOut().write((size >> 24) & 0xFF); - ctx.getOut().write((size >> 16) & 0xFF); - ctx.getOut().write((size >> 8) & 0xFF); - ctx.getOut().write((size >> 0) & 0xFF); - for (String ident : identifiers) { - ctx.getOut().write(ident.getBytes("UTF-8"));//XXX: might probably contain ';' - ctx.getOut().write(';'); - } - } catch (IOException ex) { - throw new IllegalStateException(ex); - } - } - if (cancel.get()); - new CollectIdentifiers(new HashSet(), cancel) { - private boolean encode = true; - @Override - public Void scan(Tree t, Void v) { - if (t == null) return null; - - if (t instanceof StatementTree && Utilities.isMultistatementWildcardTree((StatementTree) t)) { - return null; - } - - boolean[] goDeeper = new boolean[1]; - - Input i = normalizeInput(t, goDeeper, null); - try { - ctx.getOut().write('('); - ctx.getOut().write(kind2Encoded.get(i.kind)); - if (!TO_IGNORE.contains(i.kind)) { - content.add(kind2EncodedString.get(i.kind)); - } - if (i.name != null) { - if (encode) { - ctx.getOut().write('$'); - ctx.getOut().write(i.name.getBytes("UTF-8")); - ctx.getOut().write(';'); - } - if (isIdentifierAcceptable(i.name)) content.add(i.name); - } - - boolean oldEncode = encode; - - encode &= goDeeper[0]; - super.scan(t, v); - encode = oldEncode; - - ctx.getOut().write(')'); - } catch (IOException ex) { - //XXX - Exceptions.printStackTrace(ex); - } - - return null; - } - @Override - public Void scan(Iterable nodes, Void p) { - try { - ctx.getOut().write('('); - ctx.getOut().write(kind2Encoded.get(Kind.IDENTIFIER)); - ctx.getOut().write('$'); - ctx.getOut().write('('); - ctx.getOut().write(';'); - super.scan(nodes, p); - ctx.getOut().write(')'); - } catch (IOException ex) { - //XXX - Exceptions.printStackTrace(ex); - } - return null; - } - }.scan(tree, null); - - ctx.setIdentifiers(identifiers); - ctx.setContent(content); - if (cancel.get()); - } - - @Override - public boolean matches(InputStream encoded, AtomicBoolean cancel, BulkPattern patternIn) { - try { - return !matchesImpl(encoded, cancel, patternIn, false).isEmpty(); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - return false; - } - } - - @Override - public Map matchesWithFrequencies(InputStream encoded, BulkPattern patternIn, AtomicBoolean cancel) { - try { - return matchesImpl(encoded, cancel, patternIn, true); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - return Collections.emptyMap(); - } - } - - public Map matchesImpl(InputStream encoded, AtomicBoolean cancel, BulkPattern patternIn, boolean withFrequencies) throws IOException { - BulkPatternImpl pattern = (BulkPatternImpl) patternIn; - final NFA nfa = pattern.toNFA(); - Stack skips = new Stack(); - NFA.State active = nfa.getStartingState(); - int identSize = 0; - - identSize = encoded.read(); - identSize = (identSize << 8) + encoded.read(); - identSize = (identSize << 8) + encoded.read(); - identSize = (identSize << 8) + encoded.read(); - - Set identifiers = new HashSet(2 * identSize); - - while (identSize-- > 0) { - if (cancel.get()) return null; - int read = encoded.read(); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - - //read name: - while (read != ';') { - baos.write(read); - read = encoded.read(); - } - - identifiers.add(new String(baos.toByteArray(), "UTF-8")); - } - - Map patternsAndFrequencies = new HashMap(); - int read = encoded.read(); - - while (read != (-1)) { - if (cancel.get()) return null; - if (read == '(') { - read = encoded.read(); //kind - - Kind k = encoded2Kind.get((read << 8) + encoded.read()); - - read = encoded.read(); - - String name; - - if (read == '$') { - //XXX: - read = encoded.read(); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - - //read name: - while (read != ';') { - baos.write(read); - read = encoded.read(); - } - - read = encoded.read(); - name = new String(baos.toByteArray(), "UTF-8"); - } else { - name = null; - } - - final NFA.State newActiveAfterVariable = nfa.transition(active, new Input(Kind.IDENTIFIER, "$", false)); - Input normalizedInput = new Input(k, name, false); - boolean ignoreKind = normalizedInput.kind == Kind.IDENTIFIER || normalizedInput.kind == Kind.MEMBER_SELECT; - - NFA.State newActive = nfa.transition(active, normalizedInput); - - if (normalizedInput.name != null && !ignoreKind) { - newActive = nfa.join(newActive, nfa.transition(active, new Input(k, "$", false))); - } - - active = newActive; - - skips.push(newActiveAfterVariable); - } else { - NFA.State newActiveAfterVariable = skips.pop(); - NFA.State newActive = nfa.transition(active, UP); - NFA.State s2 = nfa.transition(newActiveAfterVariable, UP); - - active = nfa.join(newActive, s2); - - for (Res res : nfa.getResults(active)) { - if (identifiers.containsAll(pattern.getIdentifiers().get(res.patternIndex))) { - if (!withFrequencies) { - patternsAndFrequencies.put(res.pattern, 1); - return patternsAndFrequencies; - } - - Integer freqs = patternsAndFrequencies.get(res.pattern); - - if (freqs == null) freqs = 0; - - patternsAndFrequencies.put(res.pattern, freqs + 1); - } - } - - read = encoded.read(); - } - } - - return patternsAndFrequencies; - } - - private static final Map kind2Encoded; - private static final Map kind2EncodedString; - private static final Map encoded2Kind; - - static { - kind2Encoded = new EnumMap(Kind.class); - kind2EncodedString = new EnumMap(Kind.class); - encoded2Kind = new HashMap(); - - for (Kind k : Kind.values()) { - String enc = Integer.toHexString(k.ordinal()); - - if (enc.length() < 2) { - enc = "0" + enc; - } - - try { - final byte[] bytes = enc.getBytes("UTF-8"); - - assert bytes.length == 2; - - kind2Encoded.put(k, bytes); - kind2EncodedString.put(k, enc); - - encoded2Kind.put((bytes[0] << 8) + bytes[1], k); - } catch (UnsupportedEncodingException ex) { - throw new IllegalStateException(ex); - } - } - } - - public static class BulkPatternImpl extends BulkPattern { - - private final NFA nfa; - - private BulkPatternImpl(List patterns, List> identifiers, List>> requiredContent, List additionalConstraints, NFA nfa) { - super(patterns, identifiers, requiredContent, additionalConstraints); - this.nfa = nfa; - } - - NFA toNFA() { - return nfa; - } - - } - - private static final class Res { - private final String pattern; - private final int patternIndex; - - public Res(String pattern, int patternIndex) { - this.pattern = pattern; - this.patternIndex = patternIndex; - } - - } - - private static final class Input { - private final Kind kind; - private final String name; - private final boolean end; - - private Input(Kind kind, String name, boolean end) { - this.kind = kind; - this.name = name; - this.end = end; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final Input other = (Input) obj; - if (this.kind != other.kind) { - return false; - } - if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) { - return false; - } - if (this.end != other.end) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 47 * hash + (this.kind != null ? this.kind.hashCode() : 17); - hash = 47 * hash + (this.name != null ? this.name.hashCode() : 0); - hash = 47 * hash + (this.end ? 1 : 0); - return hash; - } - - @Override - public String toString() { - return kind + ", " + name + ", " + end; - } - - } - - private static final Input UP = new Input(null, null, true); - - private static boolean isIdentifierAcceptable(CharSequence content) { - if (content.length() == 0) return false; - if (content.charAt(0) == '$' || content.charAt(0) == '<') return false; - String stringValue = content.toString(); - if (stringValue.contentEquals("java") || "lang".equals(stringValue)) return false; - return true; - } - - private static class CollectIdentifiers extends CancellableTreeScanner { - - private final Set identifiers; - - public CollectIdentifiers(Set identifiers, AtomicBoolean cancel) { - super(cancel); - this.identifiers = identifiers; - } - - private void addIdentifier(Name ident) { - if (!isIdentifierAcceptable(ident)) return; - identifiers.add(ident.toString()); - } - - @Override - public R visitMemberSelect(MemberSelectTree node, P p) { - addIdentifier(node.getIdentifier()); - return super.visitMemberSelect(node, p); - } - - @Override - public R visitIdentifier(IdentifierTree node, P p) { - addIdentifier(node.getName()); - return super.visitIdentifier(node, p); - } - - @Override - public R visitClass(ClassTree node, P p) { - if (node.getSimpleName().length() == 0) { - return scan(Utilities.filterHidden(null, node.getMembers()), p); - } - addIdentifier(node.getSimpleName()); - return super.visitClass(node, p); - } - - @Override - public R visitMethod(MethodTree node, P p) { - addIdentifier(node.getName()); - return super.visitMethod(node, p); - } - - @Override - public R visitVariable(VariableTree node, P p) { - addIdentifier(node.getName()); - return super.visitVariable(node, p); - } - - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/PatternCompiler.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/PatternCompiler.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl.pm; - -import com.sun.source.tree.Scope; -import com.sun.source.tree.Tree; -import com.sun.source.util.TreePath; -import java.util.Map; -import javax.lang.model.type.TypeMirror; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.modules.java.hints.spiimpl.Utilities; -import org.netbeans.api.java.source.matching.Pattern; - -/**XXX: cancelability! - * - * @author Jan Lahoda - */ -public class PatternCompiler { - - public static Pattern compile(CompilationInfo info, String pattern, Map constraints, Iterable imports) { - Scope scope = Utilities.constructScope(info, constraints, imports); - - if (scope == null) { - return null; //TODO: can happen? - } - - Tree patternTree = Utilities.parseAndAttribute(info, pattern, scope); - - return Pattern.createPatternWithFreeVariables(new TreePath(new TreePath(info.getCompilationUnit()), patternTree), constraints); - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/processor/Bundle.properties --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/processor/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -OpenIDE-Module-Name=Java Hints Annotation Processor -OpenIDE-Module-Display-Category=Java -OpenIDE-Module-Short-Description=Java Hints Annotation Processor diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/processor/JavaHintsAnnotationProcessor.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/processor/JavaHintsAnnotationProcessor.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,635 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl.processor; - -import java.lang.reflect.Array; -import java.util.Map.Entry; -import java.util.*; -import java.util.AbstractMap.SimpleEntry; -import java.util.logging.Logger; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import javax.annotation.processing.Processor; -import javax.annotation.processing.RoundEnvironment; -import javax.annotation.processing.SupportedAnnotationTypes; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.*; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.AbstractAnnotationValueVisitor6; -import javax.lang.model.util.ElementFilter; -import javax.lang.model.util.ElementScanner6; -import javax.lang.model.util.Elements; -import javax.lang.model.util.Types; -import javax.tools.Diagnostic.Kind; -import org.openide.filesystems.annotations.LayerBuilder; -import org.openide.filesystems.annotations.LayerBuilder.File; -import org.openide.filesystems.annotations.LayerGeneratingProcessor; -import org.openide.filesystems.annotations.LayerGenerationException; -import org.openide.util.NbCollections; -import org.openide.util.lookup.ServiceProvider; - -/**Inspired by https://sezpoz.dev.java.net/. - * - * @author lahvac - */ -@SupportedSourceVersion(SourceVersion.RELEASE_6) -@SupportedAnnotationTypes("org.netbeans.spi.java.hints.*") -@ServiceProvider(service=Processor.class, position=100) -public class JavaHintsAnnotationProcessor extends LayerGeneratingProcessor { - - private static final Logger LOG = Logger.getLogger(JavaHintsAnnotationProcessor.class.getName()); - - @Override - protected boolean handleProcess(Set annotations, RoundEnvironment roundEnv) throws LayerGenerationException { - if (!roundEnv.processingOver()) { - generateTypeList("org.netbeans.spi.java.hints.Hint", roundEnv); - } - - return false; - } - - private static final String[] TRIGGERS = new String[] { - "org.netbeans.spi.java.hints.TriggerTreeKind", - "org.netbeans.spi.java.hints.TriggerPattern", - "org.netbeans.spi.java.hints.TriggerPatterns", - }; - - private static final String[] OPTIONS = new String[] { - "org.netbeans.spi.java.hints.BooleanOption" - }; - - private void generateTypeList(String annotationName, RoundEnvironment roundEnv) throws LayerGenerationException { - TypeElement hint = processingEnv.getElementUtils().getTypeElement(annotationName); - - if (hint == null) return ; - - for (Element annotated : roundEnv.getElementsAnnotatedWith(hint)) { - if (!verifyHintAnnotationAcceptable(annotated)) continue; - if (!annotated.getKind().isClass() && !annotated.getKind().isInterface()) { - if (annotated.getKind() != ElementKind.METHOD) { - //the compiler should have already warned about this - continue; - } - - annotated = annotated.getEnclosingElement(); - } else { - if (!annotated.getKind().isClass()) { - //the compiler should have already warned about this - continue; - } - } - - if (!annotated.getKind().isClass()) { - processingEnv.getMessager().printMessage(Kind.ERROR, "Internal error - cannot find class containing the hint", annotated); - continue; - } - - TypeElement clazz = (TypeElement) annotated; - String classFolder = "org-netbeans-modules-java-hints/code-hints/" + getFQN(clazz).replace('.', '-') + ".class"; - - { - LayerBuilder builder = layer(clazz); - File clazzFolder = builder.folder(classFolder); - - for (AnnotationMirror am : clazz.getAnnotationMirrors()) { - dumpAnnotation(builder, clazzFolder, clazz, am, true); - } - - clazzFolder.write(); - } - - for (ExecutableElement ee : ElementFilter.methodsIn(clazz.getEnclosedElements())) { - if (!ee.getAnnotationMirrors().isEmpty()) { - LayerBuilder builder = layer(ee); - File methodFolder = builder.folder(classFolder + "/" + ee.getSimpleName() + ".method"); - - for (AnnotationMirror am : ee.getAnnotationMirrors()) { - dumpAnnotation(builder, methodFolder, ee, am, true); - } - - methodFolder.write(); - } - } - - for (VariableElement var : ElementFilter.fieldsIn(clazz.getEnclosedElements())) { - if (!var.getAnnotationMirrors().isEmpty()) { - LayerBuilder builder = layer(var); - File fieldFolder = builder.folder(classFolder + "/" + var.getSimpleName() + ".field"); - - for (AnnotationMirror am : var.getAnnotationMirrors()) { - dumpAnnotation(builder, fieldFolder, var, am, true); - } - - if (var.getConstantValue() instanceof String) { - fieldFolder.stringvalue("constantValue", (String) var.getConstantValue()); - } - - fieldFolder.write(); - } - } - - new ElementScanner6() { - @Override public Void scan(Element e, Void p) { - AnnotationMirror hintMirror = findAnnotation(e.getAnnotationMirrors(), "org.netbeans.spi.java.hints.Hint"); - - if (hintMirror != null) { - String qualifiedName; - switch (e.getKind()) { - case METHOD: case CONSTRUCTOR: - qualifiedName = e.getEnclosingElement().asType().toString() + "." + e.getSimpleName().toString() + e.asType().toString(); - break; - case FIELD: case ENUM_CONSTANT: - qualifiedName = e.getEnclosingElement().asType().toString() + "." + e.getSimpleName().toString(); - break; - case ANNOTATION_TYPE: case CLASS: - case ENUM: case INTERFACE: - default: - qualifiedName = e.asType().toString(); - break; - } - - try { - File keywordsFile = layer(e) - .file("OptionsDialog/Keywords/".concat(qualifiedName)) - .stringvalue("location", "Editor") - .bundlevalue("tabTitle", "org.netbeans.modules.options.editor.Bundle", "CTL_Hints_DisplayName"); - - String displayName = getAttributeValue(hintMirror, "displayName", String.class); - - if (displayName != null) - keywordsFile = keywordsFile.bundlevalue("keywords-1", displayName); - - String description = getAttributeValue(hintMirror, "description", String.class); - - if (description != null) - keywordsFile = keywordsFile.bundlevalue("keywords-2", description); - - int i = 3; - - for (String sw : getAttributeValue(hintMirror, "suppressWarnings", String[].class)) { - keywordsFile = keywordsFile.stringvalue("keywords-" + i++, sw); - } - - keywordsFile.write(); - } catch (LayerGenerationException ex) { - JavaHintsAnnotationProcessor.rethrowAsRuntime(ex); - } - } - - return super.scan(e, p); - } - }.scan(annotated, null); - } - - for (String ann : TRIGGERS) { - TypeElement annRes = processingEnv.getElementUtils().getTypeElement(ann); - - if (annRes == null) continue; - - for (ExecutableElement method : ElementFilter.methodsIn(roundEnv.getElementsAnnotatedWith(annRes))) { - verifyHintMethod(method); - verifyTriggerAnnotations(method); - } - } - - for (String ann : OPTIONS) { - TypeElement annRes = processingEnv.getElementUtils().getTypeElement(ann); - - if (annRes == null) continue; - - for (VariableElement var : ElementFilter.fieldsIn(roundEnv.getElementsAnnotatedWith(annRes))) { - verifyOptionField(var); - } - } - - } - - private void dumpAnnotation(LayerBuilder builder, File folder, Element errElement, AnnotationMirror annotation, boolean topLevel) { - String fqn = getFQN(((TypeElement) annotation.getAnnotationType().asElement())).replace('.', '-'); - if (topLevel && !fqn.startsWith("org-netbeans-spi-java-hints")) return ; - final File annotationFolder = builder.folder(folder.getPath() + "/" + fqn + ".annotation"); - - for (Entry e : annotation.getElementValues().entrySet()) { - final String attrName = e.getKey().getSimpleName().toString(); - e.getValue().accept(new DumpAnnotationValue(builder, annotationFolder, attrName, errElement, annotation, e.getValue()), null); - } - - annotationFolder.write(); - } - - private String getFQN(TypeElement clazz) { - return processingEnv.getElementUtils().getBinaryName(clazz).toString(); - } - - static final String ERR_RETURN_TYPE = "The return type must be either org.netbeans.spi.editor.hints.ErrorDescription or java.util.List"; - static final String ERR_PARAMETERS = "The method must have exactly one parameter of type org.netbeans.spi.java.hints.HintContext"; - static final String ERR_MUST_BE_STATIC = "The method must be static"; - static final String ERR_OPTION_TYPE = "The option field must be of type java.lang.String"; - static final String ERR_OPTION_MUST_BE_STATIC_FINAL = "The option field must be static final"; - static final String WARN_BUNDLE_KEY_NOT_FOUND = "Bundle key %s not found"; - - private static AnnotationMirror findAnnotation(Iterable annotations, String annotationFQN) { - for (AnnotationMirror am : annotations) { - if (((TypeElement) am.getAnnotationType().asElement()).getQualifiedName().contentEquals(annotationFQN)) { - return am; - } - } - - return null; - } - - private T getAttributeValue(AnnotationMirror annotation, String attribute, Class clazz) { - if (clazz.isArray()) { - Iterable attributes = getAttributeValueInternal(annotation, attribute, Iterable.class); - - Collection coll = new ArrayList(); - Class componentType = clazz.getComponentType(); - - for (Object attr : attributes) { - if (attr instanceof AnnotationValue) { - attr = ((AnnotationValue) attr).getValue(); - } - - if (componentType.isAssignableFrom(attr.getClass())) { - coll.add(componentType.cast(attr)); - } - } - - return clazz.cast(coll.toArray((Object[]) Array.newInstance(clazz.getComponentType(), 0))); - } else { - return getAttributeValueInternal(annotation, attribute, clazz); - } - } - - private T getAttributeValueInternal(AnnotationMirror annotation, String attribute, Class clazz) { - for (Entry e : processingEnv.getElementUtils().getElementValuesWithDefaults(annotation).entrySet()) { - if (e.getKey().getSimpleName().contentEquals(attribute)) { - Object value = e.getValue().getValue(); - - if (clazz.isAssignableFrom(value.getClass())) { - return clazz.cast(value); - } - - return null; - } - } - - return null; - } - - private AnnotationValue getAttributeValueDescription(AnnotationMirror annotation, String attribute) { - for (Entry e : processingEnv.getElementUtils().getElementValuesWithDefaults(annotation).entrySet()) { - if (e.getKey().getSimpleName().contentEquals(attribute)) { - return e.getValue(); - } - } - - return null; - } - - private boolean verifyHintAnnotationAcceptable(Element hint) { - AnnotationMirror hintMirror = findAnnotation(hint.getAnnotationMirrors(), "org.netbeans.spi.java.hints.Hint"); - - if (hintMirror == null) return false; - - String id = getAttributeValue(hintMirror, "id", String.class); - - if (id == null || id.isEmpty()) { - switch (hint.getKind()) { - case CLASS: - case METHOD: - break; //OK - default: - //compiler should have already warned about this - return false; - } - } - - TypeMirror customizerProviderType = getAttributeValue(hintMirror, "customizerProvider", TypeMirror.class); - - if (customizerProviderType != null) { - Element customizerProvider = processingEnv.getTypeUtils().asElement(customizerProviderType); - - if (customizerProvider != null) { - if (customizerProvider.getKind() != ElementKind.CLASS) { - TypeElement customizerProviderInterface = processingEnv.getElementUtils().getTypeElement("org.netbeans.spi.java.hints.CustomizerProvider"); - - if (customizerProviderInterface != null && !customizerProviderInterface.equals(customizerProvider)) { - processingEnv.getMessager().printMessage(Kind.ERROR, "Customizer provider must be a concrete class", hint, hintMirror, getAttributeValueDescription(hintMirror, "customizerProvider")); - } - } else { - TypeElement customizerProviderClazz = (TypeElement) customizerProvider; - - if (!customizerProviderClazz.getModifiers().contains(Modifier.PUBLIC)) { - processingEnv.getMessager().printMessage(Kind.ERROR, "Customizer provider must be public", hint, hintMirror, getAttributeValueDescription(hintMirror, "customizerProvider")); - } - - if ( customizerProviderClazz.getEnclosingElement().getKind() != ElementKind.PACKAGE - && !customizerProviderClazz.getModifiers().contains(Modifier.STATIC)) { - processingEnv.getMessager().printMessage(Kind.ERROR, "Customizer provider must be non-static innerclass", hint, hintMirror, getAttributeValueDescription(hintMirror, "customizerProvider")); - } - - boolean foundDefaultConstructor = false; - - for (ExecutableElement ee : ElementFilter.constructorsIn(customizerProviderClazz.getEnclosedElements())) { - if (ee.getParameters().isEmpty()) { - foundDefaultConstructor = true; - if (!ee.getModifiers().contains(Modifier.PUBLIC)) { - processingEnv.getMessager().printMessage(Kind.ERROR, "Customizer provider must provide a public default constructor", hint, hintMirror, getAttributeValueDescription(hintMirror, "customizerProvider")); - } - break; - } - } - - if (!foundDefaultConstructor) { - processingEnv.getMessager().printMessage(Kind.ERROR, "Customizer provider must provide a public default constructor", hint, hintMirror, getAttributeValueDescription(hintMirror, "customizerProvider")); - } - } - } - } - - return true; - } - - private boolean verifyHintMethod(ExecutableElement method) { - StringBuilder error = new StringBuilder(); - Elements elements = processingEnv.getElementUtils(); - TypeElement errDesc = elements.getTypeElement("org.netbeans.spi.editor.hints.ErrorDescription"); - TypeElement jlIterable = elements.getTypeElement("java.lang.Iterable"); - TypeElement hintCtx = elements.getTypeElement("org.netbeans.spi.java.hints.HintContext"); - - if (errDesc == null || jlIterable == null || hintCtx == null) { - return true; - } - - Types types = processingEnv.getTypeUtils(); - TypeMirror errDescType = errDesc.asType(); //no type params, no need to erasure - TypeMirror jlIterableErrDesc = types.getDeclaredType(jlIterable, errDescType); - TypeMirror ret = method.getReturnType(); - - if (!types.isSameType(ret, errDescType) && !types.isAssignable(ret, jlIterableErrDesc)) { - error.append(ERR_RETURN_TYPE); - error.append("\n"); - } - - if (method.getParameters().size() != 1 || !types.isSameType(method.getParameters().get(0).asType(), hintCtx.asType())) { - error.append(ERR_PARAMETERS); - error.append("\n"); - } - - if (!method.getModifiers().contains(Modifier.STATIC)) { - error.append(ERR_MUST_BE_STATIC); - error.append("\n"); - } - - if (error.length() == 0) { - return true; - } - - if (error.charAt(error.length() - 1) == '\n') { - error.delete(error.length() - 1, error.length()); - } - - processingEnv.getMessager().printMessage(Kind.ERROR, error.toString(), method); - - return false; - } - - private static final Pattern VARIABLE_PATTERN = Pattern.compile("\\$[a-zA-Z0-9_]+"); - private boolean verifyTriggerAnnotations(ExecutableElement method) { - List patternAnnotations = new ArrayList(); - AnnotationMirror am = findAnnotation(method.getAnnotationMirrors(), "org.netbeans.spi.java.hints.TriggerPattern"); - - if (am != null) { - patternAnnotations.add(am); - } - - am = findAnnotation(method.getAnnotationMirrors(), "org.netbeans.spi.java.hints.TriggerPatterns"); - - if (am != null) { - patternAnnotations.addAll(Arrays.asList(getAttributeValue(am, "value", AnnotationMirror[].class))); - } - - for (AnnotationMirror patternDescription : patternAnnotations) { - String pattern = getAttributeValue(patternDescription, "value", String.class); - - if (pattern == null) continue; - - Set variables = new HashSet(); - Matcher m = VARIABLE_PATTERN.matcher(pattern); - - while (m.find()) { - variables.add(m.group(0)); - } - - for (AnnotationMirror constraint : getAttributeValue(patternDescription, "constraints", AnnotationMirror[].class)) { - String variable = getAttributeValue(constraint, "variable", String.class); - String type = getAttributeValue(constraint, "type", String.class); - - if (variable == null || type == null) continue; - - if (!variables.contains(variable)) { - processingEnv.getMessager().printMessage(Kind.WARNING, "Variable " + variable + " not used in the pattern", method, constraint, getAttributeValueDescription(constraint, "variable")); - } - } - } - - return false; - } - - private boolean verifyOptionField(VariableElement field) { - StringBuilder error = new StringBuilder(); - Elements elements = processingEnv.getElementUtils(); - TypeElement jlString = elements.getTypeElement("java.lang.String"); - - if (jlString == null) { - return true; - } - - Types types = processingEnv.getTypeUtils(); - TypeMirror jlStringType = jlString.asType(); //no type params, no need to erasure - - if (!types.isSameType(field.asType(), jlStringType)) { - error.append(ERR_RETURN_TYPE); - error.append("\n"); - } - - if (!field.getModifiers().contains(Modifier.STATIC) || !field.getModifiers().contains(Modifier.FINAL)) { - error.append(ERR_OPTION_MUST_BE_STATIC_FINAL); - error.append("\n"); - } - - Object key = field.getConstantValue(); - - if (key == null) { - error.append("Option field not a compile-time constant"); - error.append("\n"); - } - - if (error.length() == 0) { - return true; - } - - if (error.charAt(error.length() - 1) == '\n') { - error.delete(error.length() - 1, error.length()); - } - - processingEnv.getMessager().printMessage(Kind.ERROR, error.toString(), field); - - return false; - } - - private class DumpAnnotationValue extends AbstractAnnotationValueVisitor6 { - - private final LayerBuilder builder; - private final File annotationFolder; - private final String attrName; - private final Element errElement; - private final AnnotationMirror errAnnotationMirror; - private final AnnotationValue errAnnotationValue; - - public DumpAnnotationValue(LayerBuilder builder, File annotationFolder, String attrName, Element errElement, AnnotationMirror errAnnotationMirror, AnnotationValue errAnnotationValue) { - this.builder = builder; - this.annotationFolder = annotationFolder; - this.attrName = attrName; - this.errElement = errElement; - this.errAnnotationMirror = errAnnotationMirror; - this.errAnnotationValue = errAnnotationValue; - } - - public Void visitBoolean(boolean b, Void p) { - annotationFolder.boolvalue(attrName, b); - return null; - } - - public Void visitByte(byte b, Void p) { - annotationFolder.bytevalue(attrName, b); - return null; - } - - public Void visitChar(char c, Void p) { - annotationFolder.charvalue(attrName, c); - return null; - } - - public Void visitDouble(double d, Void p) { - annotationFolder.doublevalue(attrName, d); - return null; - } - - public Void visitFloat(float f, Void p) { - annotationFolder.floatvalue(attrName, f); - return null; - } - - public Void visitInt(int i, Void p) { - annotationFolder.intvalue(attrName, i); - return null; - } - - public Void visitLong(long i, Void p) { - annotationFolder.longvalue(attrName, i); - return null; - } - - public Void visitShort(short s, Void p) { - annotationFolder.shortvalue(attrName, s); - return null; - } - - public Void visitString(String s, Void p) { - if ("displayName".equals(attrName) || "description".equals(attrName) || "tooltip".equals(attrName)) { - try { - annotationFolder.bundlevalue(attrName, s); - } catch (LayerGenerationException ex) { - processingEnv.getMessager().printMessage(Kind.ERROR, ex.getLocalizedMessage(), errElement, errAnnotationMirror, errAnnotationValue); - } - } else { - annotationFolder.stringvalue(attrName, s); - } - return null; - } - - public Void visitType(TypeMirror t, Void p) { - annotationFolder.stringvalue(attrName, getFQN(((TypeElement) ((DeclaredType) t).asElement()))); - return null; - } - - public Void visitEnumConstant(VariableElement c, Void p) { - TypeElement owner = (TypeElement) c.getEnclosingElement(); - annotationFolder.stringvalue(attrName, getFQN(owner) + "." + c.getSimpleName()); - return null; - } - - public Void visitAnnotation(AnnotationMirror a, Void p) { - File f = builder.folder(annotationFolder.getPath() + "/" + attrName); - - dumpAnnotation(builder, f, errElement, a, false); - - f.write(); - return null; - } - - public Void visitArray(List vals, Void p) { - File arr = builder.folder(annotationFolder.getPath() + "/" + attrName); - int c = 0; - - for (AnnotationValue av : vals) { - av.accept(new DumpAnnotationValue(builder, arr, "item" + c, errElement, errAnnotationMirror, av), null); - c++; - } - - arr.write(); - - return null; - } - } - - @SuppressWarnings("unchecked") - private static void rethrowAsRuntime(Throwable t) throws T { - throw (T) t; - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/BooleanOption.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/BooleanOption.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2012 Sun Microsystems, Inc. - */ -package org.netbeans.spi.java.hints; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.prefs.Preferences; - -/**Specify an option that affects the way the hint works. - * - * Only {@code static final String} compile-time constant can be marked with this - * annotation. The value of the constant will be used as the key to the hint's {@link Preferences}. - * - * For hints that consist of a class, all options that are directly enclosed in the class - * will be used in their source order. - * - * For hints that consist of a single method, use {@link UseOptions} to specify which options - * from the enclosing class should be used. The order of the options will be the order in which - * they appear in the source code of the enclosing class. - * - * The customizer will be generated automatically when {@link BooleanOption} is used. - * - * Two keys need to be defined in the corresponding {@code Bundle.properties}: - * {@code LBL_.}, which will be used as the display name of - * the corresponding checkbox in the customizer, and {@code TP_.} - * which will be used as the tooltip of the checkbox. - * - * @author lahvac - */ -@Retention(RetentionPolicy.SOURCE) -@Target(ElementType.FIELD) -public @interface BooleanOption { - - /**The options' display name. Will be used as the display name of the - * checkbox in the customizer. - */ - public String displayName(); - /**The tooltip of the checkbox in the customizer. - */ - public String tooltip(); - - /**The default value of the option. - */ - public boolean defaultValue(); - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/Bundle.properties --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -#{0}: hint/suggestion name -FIX_DisableHint=Disable "{0}" Hint -FIX_ConfigureHint=Configure "{0}" Hint -FIX_DisableSuggestion=Disable "{0}" Suggestion -FIX_ConfigureSuggestion=Configure "{0}" Suggestion -#{0}: Key of the warning -LBL_FIX_Suppress_Waning=Suppress Warning - {0} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/ConstraintVariableType.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/ConstraintVariableType.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2009 Sun Microsystems, Inc. - */ - -package org.netbeans.spi.java.hints; - -import java.lang.annotation.Target; - -/**Specifies a type of a variable. During the matching process, only those - * sections of the source code that have the given type are considered. - * - * @author Jan Lahoda - */ -@Target({}) -public @interface ConstraintVariableType { - - /**Variable name, must start with the dollar sign ($). - * Variable$this is automatically bound to the current class. - */ - public String variable(); - - /**The required type of the section of source code. The value must be a type - * per JLS 4.1, i.e. a primitive type (JLS 4.2), or a reference type (JLS 4.3). - * All elements of the type must be resolvable when written to any Java file, - * they may not contain e.g. references to type variables, simple names, etc. - * - * The type may include any actual type arguments, including wildcard. - * - * While matching, the type of the tree that corresponds to the variable in - * the actual occurrence candidate is accepted if it is assignable into the - * variable defined by the attribute. - */ - public String type(); - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/CustomizerProvider.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/CustomizerProvider.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010-2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2010-2012 Sun Microsystems, Inc. - */ - -package org.netbeans.spi.java.hints; - -import java.util.prefs.Preferences; -import javax.swing.JComponent; -import org.netbeans.api.annotations.common.NonNull; - -/**A factory for hint customizer. - * - * @author lahvac - */ -public interface CustomizerProvider { - - /**Create a customizer component. The hint settings are in the given - * {@link Preferences}. The customizer can write into the provided {@link Preferences} - * immediately, the values will be persisted or rolled-back automatically - * based on the user's gesture. - * - * @param prefs the hints preferences from which the data to show should be read, - * and to which the new settings should be written - * @return a customizer component - */ - public @NonNull JComponent getCustomizer(@NonNull Preferences prefs); - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/Decision.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/Decision.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,106 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.spi.java.hints; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.TreePathHandle; -import org.openide.filesystems.FileObject; - -/** - * - * @author lahvac - */ -public abstract class Decision { - - /*XXX: should not be public*/public final TreePathHandle root; - private final Map> file2Facts = new HashMap>(); - - protected Decision(TreePathHandle root) { - this.root = root; - } - - protected abstract R makeDecision(Iterable input); - - private R previousResult; - - /*XXX: should not be public*/public boolean makeDecision() { - List inputs = new ArrayList(); - - for (List v : file2Facts.values()) { - inputs.addAll(v); - } - - R current = makeDecision(inputs); - - boolean changed = !(previousResult == null ? current == null : previousResult.equals(current)); - - previousResult = current; - - return changed; - } - - public R getCurrentResult() { - return previousResult; - } - - public void recordLocalFact(/*XXX: should not require the CompilationInfo!*/CompilationInfo info, V fact) { - List facts = file2Facts.get(info.getFileObject()); - - if (facts == null) { - file2Facts.put(info.getFileObject(), facts = new ArrayList()); - } - - facts.add(fact); - } - - public static abstract class Factory> { - /*XXX: should not be public*/public final Class decisionClass; - public Factory(Class decisionClass) { - this.decisionClass = decisionClass; - } - public abstract DecisionImpl create(TreePathHandle handle); - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/ErrorDescriptionFactory.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/ErrorDescriptionFactory.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,619 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.spi.java.hints; - -import com.sun.source.tree.BlockTree; -import com.sun.source.tree.ClassTree; -import com.sun.source.tree.LiteralTree; -import com.sun.source.tree.MemberSelectTree; -import com.sun.source.tree.MethodInvocationTree; -import com.sun.source.tree.MethodTree; -import com.sun.source.tree.ModifiersTree; -import com.sun.source.tree.StatementTree; -import com.sun.source.tree.Tree; -import com.sun.source.tree.Tree.Kind; -import com.sun.source.tree.VariableTree; -import com.sun.source.util.TreePath; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.TypeElement; -import javax.swing.SwingUtilities; -import org.netbeans.api.annotations.common.NonNull; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.GeneratorUtilities; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.JavaSource.Phase; -import org.netbeans.api.java.source.Task; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.api.java.source.WorkingCopy; -import org.netbeans.api.lexer.TokenSequence; -import org.netbeans.api.options.OptionsDisplayer; -import org.netbeans.modules.analysis.api.CodeAnalysis; -import org.netbeans.modules.analysis.spi.Analyzer.WarningDescription; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata.Options; -import org.netbeans.modules.java.hints.spiimpl.Hacks.InspectAndTransformOpener; -import org.netbeans.modules.java.hints.spiimpl.SPIAccessor; -import org.netbeans.modules.java.hints.spiimpl.SyntheticFix; -import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings; -import org.netbeans.spi.editor.hints.ChangeInfo; -import org.netbeans.spi.editor.hints.EnhancedFix; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.editor.hints.Fix; -import org.netbeans.spi.editor.hints.LazyFixList; -import org.openide.filesystems.FileObject; -import org.openide.util.Lookup; -import org.openide.util.NbBundle; -import org.openide.util.NbBundle.Messages; -import org.openide.util.Parameters; - -/** - * - * @author Jan Lahoda - */ -public class ErrorDescriptionFactory { - - private ErrorDescriptionFactory() { - } - -// public static ErrorDescription forTree(HintContext context, String text, Fix... fixes) { -// return forTree(context, context.getContext(), text, fixes); -// } - - public static ErrorDescription forTree(HintContext context, TreePath tree, String text, Fix... fixes) { - return forTree(context, tree.getLeaf(), text, fixes); - } - - public static ErrorDescription forTree(HintContext context, Tree tree, String text, Fix... fixes) { - int start; - int end; - - if (context.getHintMetadata().kind == Hint.Kind.INSPECTION) { - start = (int) context.getInfo().getTrees().getSourcePositions().getStartPosition(context.getInfo().getCompilationUnit(), tree); - end = (int) context.getInfo().getTrees().getSourcePositions().getEndPosition(context.getInfo().getCompilationUnit(), tree); - } else { - start = end = context.getCaretLocation(); - } - - if (start != (-1) && end != (-1)) { - LazyFixList fixesForED = org.netbeans.spi.editor.hints.ErrorDescriptionFactory.lazyListForFixes(resolveDefaultFixes(context, fixes)); - return org.netbeans.spi.editor.hints.ErrorDescriptionFactory.createErrorDescription("text/x-java:" + context.getHintMetadata().id, context.getSeverity(), text, context.getHintMetadata().description, fixesForED, context.getInfo().getFileObject(), start, end); - } - - return null; - } - - /**Create a new {@link ErrorDescription}. Severity is automatically inferred from the {@link HintContext}, - * and the {@link ErrorDescription} is created to be consistent with {@link ErrorDescription}s created - * by the other factory methods in this class. - * - * @param context from which the {@link Severity} and other properties are inferred. - * @param start start of the warning - * @param end end of the warning - * @param text the warning text - * @param fixes one or more {@link Fix}es to show shown to the user. - * @return a standard {@link ErrorDescription} for use in Java source - * @since 1.9 - */ - public static ErrorDescription forSpan(HintContext context, int start, int end, String text, Fix... fixes) { - if (context.getHintMetadata().kind != Hint.Kind.INSPECTION) { - start = end = context.getCaretLocation(); - } - - if (start != (-1) && end != (-1)) { - LazyFixList fixesForED = org.netbeans.spi.editor.hints.ErrorDescriptionFactory.lazyListForFixes(resolveDefaultFixes(context, fixes)); - return org.netbeans.spi.editor.hints.ErrorDescriptionFactory.createErrorDescription("text/x-java:" + context.getHintMetadata().id, context.getSeverity(), text, context.getHintMetadata().description, fixesForED, context.getInfo().getFileObject(), start, end); - } - - return null; - } - - public static ErrorDescription forName(HintContext context, TreePath tree, String text, Fix... fixes) { - return forName(context, tree.getLeaf(), text, fixes); - } - - public static ErrorDescription forName(HintContext context, Tree tree, String text, Fix... fixes) { - int[] span; - - if (context.getHintMetadata().kind == Hint.Kind.INSPECTION) { - span = computeNameSpan(tree, context); - } else { - span = new int[] {context.getCaretLocation(), context.getCaretLocation()}; - } - - if (span != null && span[0] != (-1) && span[1] != (-1)) { - LazyFixList fixesForED = org.netbeans.spi.editor.hints.ErrorDescriptionFactory.lazyListForFixes(resolveDefaultFixes(context, fixes)); - return org.netbeans.spi.editor.hints.ErrorDescriptionFactory.createErrorDescription("text/x-java:" + context.getHintMetadata().id, context.getSeverity(), text, context.getHintMetadata().description, fixesForED, context.getInfo().getFileObject(), span[0], span[1]); - } - - return null; - } - - private static int[] computeNameSpan(Tree tree, HintContext context) { - switch (tree.getKind()) { - case METHOD: - return context.getInfo().getTreeUtilities().findNameSpan((MethodTree) tree); - case ANNOTATION_TYPE: - case CLASS: - case ENUM: - case INTERFACE: - return context.getInfo().getTreeUtilities().findNameSpan((ClassTree) tree); - case VARIABLE: - return context.getInfo().getTreeUtilities().findNameSpan((VariableTree) tree); - case MEMBER_SELECT: - //XXX: - MemberSelectTree mst = (MemberSelectTree) tree; - int[] span = context.getInfo().getTreeUtilities().findNameSpan(mst); - - if (span == null) { - int end = (int) context.getInfo().getTrees().getSourcePositions().getEndPosition(context.getInfo().getCompilationUnit(), tree); - span = new int[] {end - mst.getIdentifier().length(), end}; - } - return span; - case METHOD_INVOCATION: - return computeNameSpan(((MethodInvocationTree) tree).getMethodSelect(), context); - case BLOCK: - Collection prefix = context.getMultiVariables().get("$$1$"); - - if (prefix != null) { - BlockTree bt = (BlockTree) tree; - - if (bt.getStatements().size() > prefix.size()) { - return computeNameSpan(bt.getStatements().get(prefix.size()), context); - } - } - default: - int start = (int) context.getInfo().getTrees().getSourcePositions().getStartPosition(context.getInfo().getCompilationUnit(), tree); - if ( StatementTree.class.isAssignableFrom(tree.getKind().asInterface()) - && tree.getKind() != Kind.EXPRESSION_STATEMENT - && tree.getKind() != Kind.BLOCK) { - TokenSequence ts = context.getInfo().getTokenHierarchy().tokenSequence(); - ts.move(start); - if (ts.moveNext()) { - return new int[] {ts.offset(), ts.offset() + ts.token().length()}; - } - } - return new int[] { - start, - (int) context.getInfo().getTrees().getSourcePositions().getEndPosition(context.getInfo().getCompilationUnit(), tree), - }; - } - } - - static List resolveDefaultFixes(HintContext ctx, Fix... provided) { - List auxiliaryFixes = new LinkedList(); - HintMetadata hm = SPIAccessor.getINSTANCE().getHintMetadata(ctx); - - if (hm != null) { - Set suppressWarningsKeys = new LinkedHashSet(); - - for (String key : hm.suppressWarnings) { - if (key == null || key.length() == 0) { - break; - } - - suppressWarningsKeys.add(key); - } - - - auxiliaryFixes.add(new DisableConfigure(hm, true, SPIAccessor.getINSTANCE().getHintSettings(ctx))); - auxiliaryFixes.add(new DisableConfigure(hm, false, null)); - - if (hm.kind == Hint.Kind.INSPECTION) { - auxiliaryFixes.add(new InspectFix(hm, false)); - if (!hm.options.contains(Options.QUERY)) { - auxiliaryFixes.add(new InspectFix(hm, true)); - } - } - - if (!suppressWarningsKeys.isEmpty()) { - auxiliaryFixes.addAll(createSuppressWarnings(ctx.getInfo(), ctx.getPath(), suppressWarningsKeys.toArray(new String[0]))); - } - - List result = new LinkedList(); - - for (Fix f : provided != null ? provided : new Fix[0]) { - if (f == null) continue; - - result.add(org.netbeans.spi.editor.hints.ErrorDescriptionFactory.attachSubfixes(f, auxiliaryFixes)); - } - - if (result.isEmpty()) { - result.add(org.netbeans.spi.editor.hints.ErrorDescriptionFactory.attachSubfixes(new TopLevelConfigureFix(hm), auxiliaryFixes)); - } - - return result; - } - - return Arrays.asList(provided); - } - - private static class DisableConfigure implements Fix, SyntheticFix { - private final @NonNull HintMetadata metadata; - private final boolean disable; - private final HintsSettings hintsSettings; - - DisableConfigure(@NonNull HintMetadata metadata, boolean disable, HintsSettings hintsSettings) { - this.metadata = metadata; - this.disable = disable; - this.hintsSettings = hintsSettings; - } - - @Override - public String getText() { - String displayName = metadata.displayName; - String key; - switch (metadata.kind) { - case INSPECTION: - key = disable ? "FIX_DisableHint" : "FIX_ConfigureHint"; - break; - case ACTION: - key = disable ? "FIX_DisableSuggestion" : "FIX_ConfigureSuggestion"; - break; - default: - throw new IllegalStateException(); - } - - return NbBundle.getMessage(ErrorDescriptionFactory.class, key, displayName); - } - - @Override - public ChangeInfo implement() throws Exception { - if (disable) { - hintsSettings.setEnabled(metadata, false); - //XXX: re-run hints task - } else { - OptionsDisplayer.getDefault().open("Editor/Hints/text/x-java/" + metadata.id); - } - - return null; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (this.getClass() != obj.getClass()) { - return false; - } - final DisableConfigure other = (DisableConfigure) obj; - if (this.metadata != other.metadata && (this.metadata == null || !this.metadata.equals(other.metadata))) { - return false; - } - if (this.disable != other.disable) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 43 * hash + (this.metadata != null ? this.metadata.hashCode() : 0); - hash = 43 * hash + (this.disable ? 1 : 0); - return hash; - } - - - } - - private static final class TopLevelConfigureFix extends DisableConfigure implements EnhancedFix { - - public TopLevelConfigureFix(@NonNull HintMetadata metadata) { - super(metadata, false, null); - } - - @Override - public CharSequence getSortText() { - return "\uFFFFzz"; - } - - } - - private static class InspectFix implements Fix, SyntheticFix { - private final @NonNull HintMetadata metadata; - private final boolean transform; - - InspectFix(@NonNull HintMetadata metadata, boolean transform) { - this.metadata = metadata; - this.transform = transform; - } - - @Override - @Messages({ - "DN_InspectAndTransform=Run Inspect&Transform on...", - "DN_Inspect=Run Inspect on..." - }) - public String getText() { - return transform ? Bundle.DN_InspectAndTransform() : Bundle.DN_Inspect(); - } - - @Override - public ChangeInfo implement() throws Exception { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - if (transform) { - final InspectAndTransformOpener o = Lookup.getDefault().lookup(InspectAndTransformOpener.class); - - if (o != null) { - o.openIAT(metadata); - } else { - //warn - } - } else { - CodeAnalysis.open(WarningDescription.create("text/x-java:" + metadata.id, null, null, null)); - } - } - }); - - return null; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (this.getClass() != obj.getClass()) { - return false; - } - final InspectFix other = (InspectFix) obj; - if (this.metadata != other.metadata && (this.metadata == null || !this.metadata.equals(other.metadata))) { - return false; - } - if (this.transform != other.transform) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 43 * hash + (this.metadata != null ? this.metadata.hashCode() : 0); - hash = 43 * hash + (this.transform ? 1 : 0); - return hash; - } - - - } - - /** Creates a fix, which when invoked adds @SuppresWarnings(keys) to - * nearest declaration. - * @param compilationInfo CompilationInfo to work on - * @param treePath TreePath to a tree. The method will find nearest outer - * declaration. (type, method, field or local variable) - * @param keys keys to be contained in the SuppresWarnings annotation. E.g. - * @SuppresWarnings( "key" ) or @SuppresWarnings( {"key1", "key2", ..., "keyN" } ). - * @throws IllegalArgumentException if keys are null or empty or id no suitable element - * to put the annotation on is found (e.g. if TreePath to CompilationUnit is given") - */ - static Fix createSuppressWarningsFix(CompilationInfo compilationInfo, TreePath treePath, String... keys ) { - Parameters.notNull("compilationInfo", compilationInfo); - Parameters.notNull("treePath", treePath); - Parameters.notNull("keys", keys); - - if (keys.length == 0) { - throw new IllegalArgumentException("key must not be empty"); // NOI18N - } - - if (!isSuppressWarningsSupported(compilationInfo)) { - return null; - } - - while (treePath.getLeaf().getKind() != Kind.COMPILATION_UNIT && !DECLARATION.contains(treePath.getLeaf().getKind())) { - treePath = treePath.getParentPath(); - } - - if (treePath.getLeaf().getKind() != Kind.COMPILATION_UNIT) { - return new FixImpl(TreePathHandle.create(treePath, compilationInfo), compilationInfo.getFileObject(), keys); - } else { - return null; - } - } - - /** Creates a fix, which when invoked adds @SuppresWarnings(keys) to - * nearest declaration. - * @param compilationInfo CompilationInfo to work on - * @param treePath TreePath to a tree. The method will find nearest outer - * declaration. (type, method, field or local variable) - * @param keys keys to be contained in the SuppresWarnings annotation. E.g. - * @SuppresWarnings( "key" ) or @SuppresWarnings( {"key1", "key2", ..., "keyN" } ). - * @throws IllegalArgumentException if keys are null or empty or id no suitable element - * to put the annotation on is found (e.g. if TreePath to CompilationUnit is given") - */ - static List createSuppressWarnings(CompilationInfo compilationInfo, TreePath treePath, String... keys ) { - Parameters.notNull("compilationInfo", compilationInfo); - Parameters.notNull("treePath", treePath); - Parameters.notNull("keys", keys); - - if (keys.length == 0) { - throw new IllegalArgumentException("key must not be empty"); // NOI18N - } - - Fix f = createSuppressWarningsFix(compilationInfo, treePath, keys); - - if (f != null) { - return Collections.singletonList(f); - } else { - return Collections.emptyList(); - } - } - - private static boolean isSuppressWarningsSupported(CompilationInfo info) { - //cannot suppress if there is no SuppressWarnings annotation in the platform: - if (info.getElements().getTypeElement("java.lang.SuppressWarnings") == null) - return false; - - return info.getSourceVersion().compareTo(SourceVersion.RELEASE_5) >= 0; - } - - private static final Set DECLARATION = EnumSet.of(Kind.ANNOTATION_TYPE, Kind.CLASS, Kind.ENUM, Kind.INTERFACE, Kind.METHOD, Kind.VARIABLE); - - private static final class FixImpl implements Fix, SyntheticFix { - - private String keys[]; - private TreePathHandle handle; - private FileObject file; - - public FixImpl(TreePathHandle handle, FileObject file, String... keys) { - this.keys = keys; - this.handle = handle; - this.file = file; - } - - public String getText() { - StringBuilder keyNames = new StringBuilder(); - for (int i = 0; i < keys.length; i++) { - String string = keys[i]; - keyNames.append(string); - if ( i < keys.length - 1) { - keyNames.append(", "); // NOI18N - } - } - - return NbBundle.getMessage(ErrorDescriptionFactory.class, "LBL_FIX_Suppress_Waning", keyNames.toString() ); // NOI18N - } - - public ChangeInfo implement() throws IOException { - JavaSource js = JavaSource.forFileObject(file); - - js.runModificationTask(new Task() { - public void run(WorkingCopy copy) throws IOException { - copy.toPhase(Phase.RESOLVED); //XXX: performance - TreePath path = handle.resolve(copy); - - while (path != null && path.getLeaf().getKind() != Kind.COMPILATION_UNIT && !DECLARATION.contains(path.getLeaf().getKind())) { - path = path.getParentPath(); - } - - if (path.getLeaf().getKind() == Kind.COMPILATION_UNIT) { - return ; - } - - Tree top = path.getLeaf(); - ModifiersTree modifiers = null; - - switch (top.getKind()) { - case ANNOTATION_TYPE: - case CLASS: - case ENUM: - case INTERFACE: - modifiers = ((ClassTree) top).getModifiers(); - break; - case METHOD: - modifiers = ((MethodTree) top).getModifiers(); - break; - case VARIABLE: - modifiers = ((VariableTree) top).getModifiers(); - break; - default: assert false : "Unhandled Tree.Kind"; // NOI18N - } - - if (modifiers == null) { - return ; - } - - TypeElement el = copy.getElements().getTypeElement("java.lang.SuppressWarnings"); // NOI18N - - if (el == null) { - return ; - } - - LiteralTree[] keyLiterals = new LiteralTree[keys.length]; - - for (int i = 0; i < keys.length; i++) { - keyLiterals[i] = copy.getTreeMaker(). - Literal(keys[i]); - } - - ModifiersTree nueMods = GeneratorUtilities.get(copy).appendToAnnotationValue(modifiers, el, "value", keyLiterals); - - copy.rewrite(modifiers, nueMods); - } - }).commit(); - - return null; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final FixImpl other = (FixImpl) obj; - if (!Arrays.deepEquals(this.keys, other.keys)) { - return false; - } - if (this.handle != other.handle && (this.handle == null || !this.handle.equals(other.handle))) { - return false; - } - if (this.file != other.file && (this.file == null || !this.file.equals(other.file))) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 5; - hash = 79 * hash + Arrays.deepHashCode(this.keys); - hash = 79 * hash + (this.handle != null ? this.handle.hashCode() : 0); - hash = 79 * hash + (this.file != null ? this.file.hashCode() : 0); - return hash; - } - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/Hint.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/Hint.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,128 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.spi.java.hints; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import org.netbeans.spi.editor.hints.Severity; - -/** Description of a hint. - * When applied to a class, any enclosed method marked with a trigger - * will be considered to be part of this hint. When applied to a method, only this specific - * method will be considered to the part of the hint. - * Currently recognized triggers include {@link TriggerPattern} and {@link TriggerTreeKind}. - * @author lahvac, Petr Hrebejk - */ -@Target({ElementType.TYPE, ElementType.METHOD}) -@Retention(RetentionPolicy.SOURCE) -public @interface Hint { - /**Manually specify the hint's id. Use only reorganizing code to keep compatibility with settings - * from previous version. Id will be generated automatically is not specified. - */ - public String id() default ""; - /** The hint's display name. - */ - public String displayName(); - /** The hint's long description. - */ - public String description(); - /**Category where the hint belongs. - */ - public String category(); - /**Should the hint be enabled by default?*/ - public boolean enabled() default true; - /**Default severity of the hint. {@link Severity#HINT} will typically be shown - * only on the line with the caret.*/ - public Severity severity() default Severity.VERIFIER; - /**Suppress warnings keys that should automatically suppress the hint.*/ - public String[] suppressWarnings() default {}; - /**A customizer that allows to customize hint's preferences. - */ - public Class customizerProvider() default CustomizerProvider.class; - /**Whether the hint should be considered an {@link Kind#INSPECTION inspection}, i.e. it detects a code smell, - * or otherwise leads to improving the code, or a {@link Kind#SUGGESTION}, which is simply - * an offer to do automatically do something for the user. - */ - public Kind hintKind() default Kind.INSPECTION; - /**Specify various options for the hint*/ - public Options[] options() default {}; - - /**Whether the hint should be considered a {@link Kind#HINT hint}, e.g. it - * detects a code smell, or otherwise leads to improving the code, or a {@link Kind#ACTION}, - * which is simply an offer to do automatically do something for the user. - */ - public enum Kind { - /**The hint represents a code-smell detector, or alike. It marks code that - * is not correct (in some sense). - */ - INSPECTION, - - /**The hint represents an offer to the user to automatically alter the code. - * The transformation is not intended to improve the code, only allow the - * user to do some kind of code transformation quickly. - * - * The only meaningful severity for suggestions if {@link Severity#CURRENT_LINE_WARNING}. - */ - ACTION; - } - - /**Various options to altering the behavior of the hint. - */ - public enum Options { - /**The hint does not produce any automatic transformations that could be run - * inside the Inspect&Refactor dialog. - */ - QUERY, - /**The hint cannot be run inside the Inspect&Refactor dialog. - */ - NO_BATCH, - /** - * The hint requires heavyweight processing so it should be run explicitly only by Inspect, Refactor (or similar) - * features - */ - HEAVY; - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/HintContext.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/HintContext.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,230 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.spi.java.hints; - -import com.sun.source.util.TreePath; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.prefs.Preferences; -import javax.lang.model.type.TypeMirror; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata; -import org.netbeans.modules.java.hints.spiimpl.MessageImpl; -import org.netbeans.modules.java.hints.spiimpl.SPIAccessor; -import org.netbeans.modules.java.hints.spiimpl.hints.GlobalProcessingContext; -import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings; -import org.netbeans.spi.editor.hints.Severity; -import org.netbeans.spi.java.hints.Decision.Factory; -import org.netbeans.spi.java.hints.Hint.Kind; - -/** - * - * @author Jan Lahoda - */ -public class HintContext { - - private final CompilationInfo info; - private final HintsSettings settings; - private final Preferences preferences; - private final Severity severity; - private final HintMetadata metadata; - private final GlobalProcessingContext globalContext; - private final TreePath path; - private final Map variables; - private final Map> multiVariables; - private final Map variableNames; - private final Collection messages; - private final Map constraints; - private final boolean bulkMode; - private final AtomicBoolean cancel; - private final int caret; - - private HintContext(CompilationInfo info, HintsSettings settings, HintMetadata metadata, GlobalProcessingContext globalContext, TreePath path, Map variables, Map> multiVariables, Map variableNames, Map constraints, Collection problems, boolean bulkMode, AtomicBoolean cancel, int caret) { - this.info = info; - this.settings = settings; - this.preferences = metadata != null ? settings.getHintPreferences(metadata) : null; - this.severity = preferences != null ? settings.getSeverity(metadata) : Severity.ERROR; - this.metadata = metadata; - this.globalContext = globalContext; - this.path = path; - - variables = new HashMap(variables); - variables.put("$_", path); - - this.variables = variables; - this.multiVariables = multiVariables; - this.variableNames = variableNames; - this.messages = problems; - this.constraints = constraints; - this.bulkMode = bulkMode; - this.cancel = cancel; - this.caret = caret; - } - - public CompilationInfo getInfo() { - return info; - } - - public Preferences getPreferences() { - return preferences; - } - - public Severity getSeverity() { - return severity; - } - - public TreePath getPath() { - return path; - } - - public Map getVariables() { - return variables; - } - - public Map> getMultiVariables() { - return multiVariables; - } - - public Map getVariableNames() { - return variableNames; - } - - HintMetadata getHintMetadata() { - return metadata; - } - - //TODO: not sure it should be here: - public Map getConstraints() { - return constraints; - } - - /** - * Will be used only for refactoring(s), will be ignored for hints. - * - * @param kind - * @param text - */ - public void reportMessage(MessageKind kind, String text) { - messages.add(new MessageImpl(kind, text)); - } - - /**Returns {@code true} if the hint is being run in over many files, {@code false} - * if only the file opened in the editor is being inspected. - * - * @return {@code true} if the hint is being run in over many files. - */ - public boolean isBulkMode() { - return bulkMode; - } - - /**Returns {@code true} if the computation has been canceled. - * - * @return {@code true} if the computation has been canceled. - */ - public boolean isCanceled() { - return cancel.get(); - } - - /**For suggestions, returns the caret location for the editor - * for which the suggestion is being computed. Returns -1 for hints. - * - * @return for suggestions, returns the caret location, -1 otherwise - */ - public int getCaretLocation() { - return metadata.kind == Kind.ACTION ? caret : -1; - } - - public > D findDecision(TreePathHandle forPath, Factory f) { - List> decs = globalContext.decisions.get(forPath); - - if (decs == null) { - globalContext.decisions.put(forPath, decs = new ArrayList>()); - } - - for (Decision d : decs) { - if (d.getClass() == f.decisionClass) { - return f.decisionClass.cast(d); - } - } - - D res = f.create(forPath); - - decs.add((Decision) res); - - return res; - } - - public Decision decision; - - public Decision getDecision() { - return decision; - } - - public enum MessageKind { - WARNING, ERROR; - } - - static { - SPIAccessor.setINSTANCE(new SPIAccessor() { - @Override public HintContext createHintContext(CompilationInfo info, HintsSettings settings, HintMetadata metadata, GlobalProcessingContext globalContext, TreePath path, Map variables, Map> multiVariables, Map variableNames, Map constraints, Collection problems, boolean bulkMode, AtomicBoolean cancel, int caret) { - return new HintContext(info, settings, metadata, globalContext, path, variables, multiVariables, variableNames, constraints, problems, bulkMode, cancel, caret); - } - @Override public HintContext createHintContext(CompilationInfo info, HintsSettings settings, HintMetadata metadata, GlobalProcessingContext globalContext, TreePath path, Map variables, Map> multiVariables, Map variableNames) { - return new HintContext(info, settings, metadata, globalContext, path, variables, multiVariables, variableNames, Collections.emptyMap(), new LinkedList(), false, new AtomicBoolean(), -1); - } - @Override public HintMetadata getHintMetadata(HintContext ctx) { - return ctx.getHintMetadata(); - } - @Override public HintsSettings getHintSettings(HintContext ctx) { - return ctx.settings; - } - }); - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/HintSeverity.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/HintSeverity.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2011 Sun Microsystems, Inc. - */ -package org.netbeans.spi.java.hints; - -import org.netbeans.spi.editor.hints.Severity; - -/** Severity of hint - *
  • ERROR - will show up as error - *
  • WARNING - will show up as warning - *
  • CURRENT_LINE_WARNING - will only show up when the caret is placed in the erroneous element - * @author Petr Hrebejk - */ -public enum HintSeverity { - ERROR, - WARNING, - CURRENT_LINE_WARNING; - - public Severity toEditorSeverity() { - switch ( this ) { - case ERROR: - return Severity.ERROR; - case WARNING: - return Severity.VERIFIER; - case CURRENT_LINE_WARNING: - return Severity.HINT; - default: - return null; - } - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/IntegerOption.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/IntegerOption.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,99 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.spi.java.hints; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Declares an int-value option that affects hint processing. - * If the Hint mixes integer and boolean options, the integer options - * come first, boolean second in the UI. - * - * @author sdedic - */ -@Retention(RetentionPolicy.SOURCE) -@Target(ElementType.FIELD) -@Documented -public @interface IntegerOption { - /** - * @return Display name of the option - */ - public String displayName(); - - /** - * @return tooltip for mouse hover over the option - */ - public String tooltip() default ""; - - /** - * @return default value for the option - */ - public int defaultValue() default 0; - - /** - * Minimum value for the option. If Integer.MIN_VALUE (the default), - * no minimum will be enforced. - * - * @return minimum value. - */ - public int minValue() default 0; - - /** - * Maximum value for the option. If Integer.MAX_VALUE (the default), - * no maximum will be enforced. Please do choose a reasonable maximum value, - * as the UI may size the input box to accommodate all digits of the maximum - * permitted value, and the input box may seem unreasonably large. - * - * @return maximum value - */ - public int maxValue() default Integer.MAX_VALUE; - - /** - * If non-zero, a spinner will be created with the specified step. If zero (the default), - * a plain input will be presented. Negative values are not accepted at the moment and are reserved. - */ - public int step() default 0; -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/JavaFix.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/JavaFix.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,309 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2012 Sun Microsystems, Inc. - */ - -package org.netbeans.spi.java.hints; - -import com.sun.source.util.TreePath; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.ByteBuffer; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.lang.model.type.TypeMirror; -import javax.swing.text.BadLocationException; -import javax.swing.text.Document; -import org.netbeans.api.annotations.common.NonNull; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.api.java.source.WorkingCopy; -import org.netbeans.api.queries.FileEncodingQuery; -import org.netbeans.modules.java.hints.spiimpl.JavaFixImpl; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchUtilities; -import org.netbeans.modules.refactoring.spi.RefactoringElementImplementation; -import org.netbeans.spi.editor.hints.ChangeInfo; -import org.netbeans.spi.editor.hints.Fix; -import org.openide.filesystems.FileObject; -import org.openide.util.Exceptions; -import org.openide.util.Parameters; - -/**A base class for fixes that modify Java source code. Using this class - * as a base class makes creating the fix somewhat simpler, but also supports - * running the hint in the Inspect&Transform dialog. The fix can be converted - * to {@link Fix} by means of the {@link #toEditorFix() } method. - * - * @see JavaFixUtilities for various predefined fixes. - * @author Jan Lahoda - */ -public abstract class JavaFix { - - private final TreePathHandle handle; - private final Map options; - - /**Create JavaFix with the given base {@link TreePath}. The base {@link TreePath} - * will be passed back to the real implementation of the fix. - * - * @param info a {@link CompilationInfo} from which the given {@link TreePath} originates - * @param tp a {@link TreePath} that will be passed back to the - * {@link #performRewrite(org.netbeans.spi.java.hints.JavaFix.TransformationContext) } method - */ - protected JavaFix(@NonNull CompilationInfo info, @NonNull TreePath tp) { - this(info, tp, Collections.emptyMap()); - } - - JavaFix(CompilationInfo info, TreePath tp, Map options) { - this.handle = TreePathHandle.create(tp, info); - this.options = Collections.unmodifiableMap(new HashMap(options)); - } - - /**Create JavaFix with the given base {@link TreePathHandle}. The base {@link TreePathHandle} - * will be resolved and passed back to the real implementation of the fix. - * - * @param handle a {@link TreePathHandle} that will be resolved and passed back to the - * {@link #performRewrite(org.netbeans.spi.java.hints.JavaFix.TransformationContext) } method - */ - protected JavaFix(@NonNull TreePathHandle handle) { - this(handle, Collections.emptyMap()); - } - - JavaFix(TreePathHandle handle, Map options) { - this.handle = handle; - this.options = Collections.unmodifiableMap(new HashMap(options)); - } - - /**The display text of the fix. - * - * @return the display text of the fix. - */ - protected abstract @NonNull String getText(); - - /**Do the transformations needed to implement the hint's function. - * - * @param ctx a context over which the fix should operate - * @throws Exception if something goes wrong while performing the transformation - * - will be logged by the infrastructure - */ - protected abstract void performRewrite(@NonNull TransformationContext ctx) throws Exception; - - /**Convert this {@link JavaFix} into the Editor Hints {@link Fix}. - * - * @return a {@link Fix}, that when invoked, will invoke {@link #performRewrite(org.netbeans.spi.java.hints.JavaFix.TransformationContext) } - * method on this {@link JavaFix}. - */ - public final Fix toEditorFix() { - return new JavaFixImpl(this); - } - - static { - JavaFixImpl.Accessor.INSTANCE = new JavaFixImpl.Accessor() { - @Override - public String getText(JavaFix jf) { - return jf.getText(); - } - @Override - public ChangeInfo process(JavaFix jf, WorkingCopy wc, boolean canShowUI, Map resourceContent, Collection fileChanges) throws Exception { - TreePath tp = jf.handle.resolve(wc); - - if (tp == null) { - Logger.getLogger(JavaFix.class.getName()).log(Level.SEVERE, "Cannot resolve handle={0}", jf.handle); - return null; - } - - jf.performRewrite(new TransformationContext(wc, tp, canShowUI, resourceContent, fileChanges)); - - return null; - } - @Override - public FileObject getFile(JavaFix jf) { - return jf.handle.getFileObject(); - } - @Override - public Map getOptions(JavaFix jf) { - return jf.options; - } - - @Override - public Fix rewriteFix(CompilationInfo info, String displayName, TreePath what, String to, Map parameters, Map> parametersMulti, Map parameterNames, Map constraints, Map options, String... imports) { - return JavaFixUtilities.rewriteFix(info, displayName, what, to, parameters, parametersMulti, parameterNames, constraints, options, imports); - } - - @Override - public Fix createSuppressWarningsFix(CompilationInfo compilationInfo, TreePath treePath, String... keys) { - return ErrorDescriptionFactory.createSuppressWarningsFix(compilationInfo, treePath, keys); - } - - @Override - public List createSuppressWarnings(CompilationInfo compilationInfo, TreePath treePath, String... keys) { - return ErrorDescriptionFactory.createSuppressWarnings(compilationInfo, treePath, keys); - } - - @Override - public List resolveDefaultFixes(HintContext ctx, Fix... provided) { - return ErrorDescriptionFactory.resolveDefaultFixes(ctx, provided); - } - }; - } - - /**A context that contains a reference to a {@link WorkingCopy} through which - * modifications of Java source code can be made. - * - */ - public static final class TransformationContext { - private final WorkingCopy workingCopy; - private final TreePath path; - private final boolean canShowUI; - private final Map resourceContentChanges; - private final Collection fileChanges; - TransformationContext(WorkingCopy workingCopy, TreePath path, boolean canShowUI, Map resourceContentChanges, Collection fileChanges) { - this.workingCopy = workingCopy; - this.path = path; - this.canShowUI = canShowUI; - this.resourceContentChanges = resourceContentChanges; - this.fileChanges = fileChanges; - } - - boolean isCanShowUI() { - return canShowUI; - } - - /**Returns the {@link TreePath} that was passed to a {@link JavaFix} constructor. - * - * @return the {@link TreePath} that was passed to a {@link JavaFix} constructor. - */ - public @NonNull TreePath getPath() { - return path; - } - - /**A {@link WorkingCopy} over which the transformation should operate. - * @return {@link WorkingCopy} over which the transformation should operate. - */ - public @NonNull WorkingCopy getWorkingCopy() { - return workingCopy; - } - - /**Allows access to non-Java resources. The content of this InputStream will - * include all changes done through {@link #getResourceOutput(org.openide.filesystems.FileObject) } - * before calling this method. - * - * @param file whose content should be returned - * @return the file's content - * @throws IOException if something goes wrong while opening the file - * @throws IllegalArgumentException if {@code file} parameter is null, or - * if it represents a Java file - */ - public @NonNull InputStream getResourceContent(@NonNull FileObject file) throws IOException, IllegalArgumentException { - Parameters.notNull("file", file); - if ("text/x-java".equals(file.getMIMEType("text/x-java"))) - throw new IllegalArgumentException("Cannot access Java files"); - - byte[] newContent = resourceContentChanges != null ? resourceContentChanges.get(file) : null; - - if (newContent == null) { - final Document doc = BatchUtilities.getDocument(file); - - if (doc != null) { - final String[] result = new String[1]; - - doc.render(new Runnable() { - @Override public void run() { - try { - result[0] = doc.getText(0, doc.getLength()); - } catch (BadLocationException ex) { - Exceptions.printStackTrace(ex); - } - } - }); - - if (result[0] != null) { - ByteBuffer encoded = FileEncodingQuery.getEncoding(file).encode(result[0]); - byte[] encodedBytes = new byte[encoded.remaining()]; - - encoded.get(encodedBytes); - - return new ByteArrayInputStream(encodedBytes); - } - } - - return file.getInputStream(); - } else { - return new ByteArrayInputStream(newContent); - } - } - - /**Record a changed version of a file. The changes will be applied altogether with - * changes to the Java file. In Inspect&Transform, changes done through this - * method will be part of the preview. - * - * @param file whose content should be changed - * @return an {@link java.io.OutputStream} into which the new content of the file should be written - * @throws IOException if something goes wrong while opening the file - * @throws IllegalArgumentException if {@code file} parameter is null, or - * if it represents a Java file - */ - public @NonNull OutputStream getResourceOutput(@NonNull final FileObject file) throws IOException { - Parameters.notNull("file", file); - if ("text/x-java".equals(file.getMIMEType("text/x-java"))) - throw new IllegalArgumentException("Cannot access Java files"); - if (resourceContentChanges == null) return file.getOutputStream(); - - return new ByteArrayOutputStream() { - @Override public void close() throws IOException { - super.close(); - resourceContentChanges.put(file, toByteArray()); - } - }; - } - - Collection getFileChanges() { - return fileChanges; - } - - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/JavaFixUtilities.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/JavaFixUtilities.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1642 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2012 Sun Microsystems, Inc. - */ -package org.netbeans.spi.java.hints; - -import com.sun.javadoc.Doc; -import com.sun.javadoc.Tag; -import com.sun.source.tree.AnnotationTree; -import com.sun.source.tree.AssignmentTree; -import com.sun.source.tree.BinaryTree; -import com.sun.source.tree.BlockTree; -import com.sun.source.tree.CaseTree; -import com.sun.source.tree.CatchTree; -import com.sun.source.tree.ClassTree; -import com.sun.source.tree.CompilationUnitTree; -import com.sun.source.tree.CompoundAssignmentTree; -import com.sun.source.tree.ExpressionStatementTree; -import com.sun.source.tree.ExpressionTree; -import com.sun.source.tree.IdentifierTree; -import com.sun.source.tree.IfTree; -import com.sun.source.tree.LambdaExpressionTree; -import com.sun.source.tree.LiteralTree; -import com.sun.source.tree.MemberSelectTree; -import com.sun.source.tree.MethodInvocationTree; -import com.sun.source.tree.MethodTree; -import com.sun.source.tree.ModifiersTree; -import com.sun.source.tree.NewArrayTree; -import com.sun.source.tree.NewClassTree; -import com.sun.source.tree.ParameterizedTypeTree; -import com.sun.source.tree.ParenthesizedTree; -import com.sun.source.tree.Scope; -import com.sun.source.tree.StatementTree; -import com.sun.source.tree.SwitchTree; -import com.sun.source.tree.Tree; -import com.sun.source.tree.Tree.Kind; -import com.sun.source.tree.TryTree; -import com.sun.source.tree.TypeParameterTree; -import com.sun.source.tree.UnaryTree; -import com.sun.source.tree.UnionTypeTree; -import com.sun.source.tree.VariableTree; -import com.sun.source.util.SourcePositions; -import com.sun.source.util.TreePath; -import com.sun.source.util.TreePathScanner; -import com.sun.source.util.TreeScanner; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumMap; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.IdentityHashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.Callable; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.regex.Matcher; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.classpath.ClassPath.PathConversionMode; -import org.netbeans.api.java.queries.SourceForBinaryQuery; -import org.netbeans.api.java.source.ClasspathInfo; -import org.netbeans.api.java.source.ClasspathInfo.PathKind; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.SourceUtils; -import org.netbeans.api.java.source.TreeMaker; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.api.java.source.TypeMirrorHandle; -import org.netbeans.api.java.source.WorkingCopy; -import org.netbeans.api.java.source.matching.Occurrence; -import org.netbeans.api.java.source.matching.Pattern; -import org.netbeans.api.project.FileOwnerQuery; -import org.netbeans.api.project.Project; -import org.netbeans.modules.java.hints.spiimpl.Hacks; -import org.netbeans.modules.java.hints.spiimpl.Utilities; -import org.netbeans.modules.java.hints.spiimpl.ipi.upgrade.ProjectDependencyUpgrader; -import org.netbeans.modules.refactoring.spi.SimpleRefactoringElementImplementation; -import org.netbeans.spi.editor.hints.Fix; -import org.netbeans.spi.java.classpath.support.ClassPathSupport; -import org.netbeans.spi.java.hints.JavaFix.TransformationContext; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; -import org.openide.loaders.DataFolder; -import org.openide.loaders.DataObject; -import org.openide.loaders.DataObjectNotFoundException; -import org.openide.modules.SpecificationVersion; -import org.openide.text.PositionBounds; -import org.openide.util.Exceptions; -import org.openide.util.Lookup; -import org.openide.util.NbBundle.Messages; -import org.openide.util.NbCollections; - -/**Factory methods for various predefined {@link JavaFix} implementations. - * - * @author lahvac - */ -public class JavaFixUtilities { - - /**Prepare a fix that will replace the given tree node ({@code what}) with the - * given code. Any variables in the {@code to} pattern will be replaced with their - * values from {@link HintContext#getVariables() }, {@link HintContext#getMultiVariables() } - * and {@link HintContext#getVariableNames() }. - * - * @param ctx basic context for which the fix should be created - * @param displayName the display name of the fix - * @param what the tree node that should be replaced - * @param to the new code that should replaced the {@code what} tree node - * @return an editor fix that performs the required transformation - */ - public static Fix rewriteFix(HintContext ctx, String displayName, TreePath what, final String to) { - return rewriteFix(ctx.getInfo(), displayName, what, to, ctx.getVariables(), ctx.getMultiVariables(), ctx.getVariableNames(), ctx.getConstraints(), Collections.emptyMap()); - } - - static Fix rewriteFix(CompilationInfo info, String displayName, TreePath what, final String to, Map parameters, Map> parametersMulti, final Map parameterNames, Map constraints, Map options, String... imports) { - final Map params = new HashMap(); - final Map extraParamsData = new HashMap(); - - for (Entry e : parameters.entrySet()) { - params.put(e.getKey(), TreePathHandle.create(e.getValue(), info)); - if (e.getValue() instanceof Callable) { - try { - extraParamsData.put(e.getKey(), ((Callable) e.getValue()).call()); - } catch (Exception ex) { - Exceptions.printStackTrace(ex); - } - } - } - - final Map> paramsMulti = new HashMap>(); - - for (Entry> e : parametersMulti.entrySet()) { - Collection tph = new LinkedList(); - - for (TreePath tp : e.getValue()) { - tph.add(TreePathHandle.create(tp, info)); - } - - paramsMulti.put(e.getKey(), tph); - } - - final Map> constraintsHandles = new HashMap>(); - - for (Entry c : constraints.entrySet()) { - constraintsHandles.put(c.getKey(), TypeMirrorHandle.create(c.getValue())); - } - - if (displayName == null) { - displayName = defaultFixDisplayName(info, parameters, to); - } - - return new JavaFixRealImpl(info, what, options, displayName, to, params, extraParamsData, paramsMulti, parameterNames, constraintsHandles, Arrays.asList(imports)).toEditorFix(); - } - - /**Creates a fix that removes the given code corresponding to the given tree - * node from the source code. - * - * @param ctx basic context for which the fix should be created - * @param displayName the display name of the fix - * @param what the tree node that should be removed - * @return an editor fix that removes the give tree from the source code - */ - public static Fix removeFromParent(HintContext ctx, String displayName, TreePath what) { - return new RemoveFromParent(displayName, ctx.getInfo(), what).toEditorFix(); - } - - private static String defaultFixDisplayName(CompilationInfo info, Map variables, String replaceTarget) { - Map stringsForVariables = new HashMap(); - - for (Entry e : variables.entrySet()) { - Tree t = e.getValue().getLeaf(); - SourcePositions sp = info.getTrees().getSourcePositions(); - int startPos = (int) sp.getStartPosition(info.getCompilationUnit(), t); - int endPos = (int) sp.getEndPosition(info.getCompilationUnit(), t); - - if (startPos >= 0 && endPos >= 0) { - stringsForVariables.put(e.getKey(), info.getText().substring(startPos, endPos)); - } else { - stringsForVariables.put(e.getKey(), ""); - } - } - - if (!stringsForVariables.containsKey("$this")) { - //XXX: is this correct? - stringsForVariables.put("$this", "this"); - } - - for (Entry e : stringsForVariables.entrySet()) { - String quotedVariable = java.util.regex.Pattern.quote(e.getKey()); - String quotedTarget = Matcher.quoteReplacement(e.getValue()); - replaceTarget = replaceTarget.replaceAll(quotedVariable, quotedTarget); - } - - return "Rewrite to " + replaceTarget; - } - - private static void checkDependency(CompilationInfo copy, Element e, boolean canShowUI) { - SpecificationVersion sv = computeSpecVersion(copy, e); - - while (sv == null && e.getKind() != ElementKind.PACKAGE) { - e = e.getEnclosingElement(); - sv = computeSpecVersion(copy, e); - } - - if (sv == null) { - return ; - } - - Project currentProject = FileOwnerQuery.getOwner(copy.getFileObject()); - - if (currentProject == null) { - return ; - } - - FileObject file = getFile(copy, e); - - if (file == null) { - return ; - } - - FileObject root = findRootForFile(file, copy.getClasspathInfo()); - - if (root == null) { - return ; - } - - Project referedProject = FileOwnerQuery.getOwner(file); - - if (referedProject != null && currentProject.getProjectDirectory().equals(referedProject.getProjectDirectory())) { - return ; - } - - for (ProjectDependencyUpgrader pdu : Lookup.getDefault().lookupAll(ProjectDependencyUpgrader.class)) { - if (pdu.ensureDependency(currentProject, root, sv, canShowUI)) { - return ; - } - } - } - - private static java.util.regex.Pattern SPEC_VERSION = java.util.regex.Pattern.compile("[0-9]+(\\.[0-9]+)+"); - - static SpecificationVersion computeSpecVersion(CompilationInfo info, Element el) { - if (!Utilities.isJavadocSupported(info)) return null; - - Doc javaDoc = info.getElementUtilities().javaDocFor(el); - - if (javaDoc == null) return null; - - for (Tag since : javaDoc.tags("@since")) { - String text = since.text(); - - Matcher m = SPEC_VERSION.matcher(text); - - if (!m.find()) { - continue; - } - - return new SpecificationVersion(m.group()/*ver.toString()*/); - } - - return null; - } - - @SuppressWarnings("deprecation") - private static FileObject getFile(CompilationInfo copy, Element e) { - return SourceUtils.getFile(e, copy.getClasspathInfo()); - } - - private static FileObject findRootForFile(final FileObject file, final ClasspathInfo cpInfo) { - ClassPath cp = ClassPathSupport.createProxyClassPath( - new ClassPath[] { - cpInfo.getClassPath(ClasspathInfo.PathKind.SOURCE), - cpInfo.getClassPath(ClasspathInfo.PathKind.BOOT), - cpInfo.getClassPath(ClasspathInfo.PathKind.COMPILE), - }); - - FileObject root = cp.findOwnerRoot(file); - - if (root != null) { - return root; - } - - for (ClassPath.Entry e : cp.entries()) { - FileObject[] sourceRoots = SourceForBinaryQuery.findSourceRoots(e.getURL()).getRoots(); - - if (sourceRoots.length == 0) continue; - - ClassPath sourcePath = ClassPathSupport.createClassPath(sourceRoots); - - root = sourcePath.findOwnerRoot(file); - - if (root != null) { - return root; - } - } - return null; - } - - private static boolean isStaticElement(Element el) { - if (el == null) return false; - - if (el.asType() == null || el.asType().getKind() == TypeKind.ERROR) { - return false; - } - - if (el.getModifiers().contains(Modifier.STATIC)) { - //XXX: - if (!el.getKind().isClass() && !el.getKind().isInterface()) { - return false; - } - - return true; - } - - if (el.getKind().isClass() || el.getKind().isInterface()) { - return el.getEnclosingElement().getKind() == ElementKind.PACKAGE; - } - - return false; - } - - private static class JavaFixRealImpl extends JavaFix { - private final String displayName; - private final Map params; - private final Map extraParamsData; - private final Map> paramsMulti; - private final Map parameterNames; - private final Map> constraintsHandles; - private final Iterable imports; - private final String to; - - public JavaFixRealImpl(CompilationInfo info, TreePath what, Map options, String displayName, String to, Map params, Map extraParamsData, Map> paramsMulti, final Map parameterNames, Map> constraintsHandles, Iterable imports) { - super(info, what, options); - - this.displayName = displayName; - this.to = to; - this.params = params; - this.extraParamsData = extraParamsData; - this.paramsMulti = paramsMulti; - this.parameterNames = parameterNames; - this.constraintsHandles = constraintsHandles; - this.imports = imports; - } - - @Override - protected String getText() { - return displayName; - } - - @Override - protected void performRewrite(TransformationContext ctx) { - final WorkingCopy wc = ctx.getWorkingCopy(); - TreePath tp = ctx.getPath(); - final Map parameters = new HashMap(); - - for (Entry e : params.entrySet()) { - TreePath p = e.getValue().resolve(wc); - - if (p == null) { - Logger.getLogger(JavaFix.class.getName()).log(Level.SEVERE, "Cannot resolve handle={0}", e.getValue()); - } - - parameters.put(e.getKey(), p); - } - - final Map> parametersMulti = new HashMap>(); - - for (Entry> e : paramsMulti.entrySet()) { - Collection tps = new LinkedList(); - - for (TreePathHandle tph : e.getValue()) { - TreePath p = tph.resolve(wc); - - if (p == null) { - Logger.getLogger(JavaFix.class.getName()).log(Level.SEVERE, "Cannot resolve handle={0}", e.getValue()); - } - - tps.add(p); - } - - parametersMulti.put(e.getKey(), tps); - } - - Map constraints = new HashMap(); - - for (Entry> c : constraintsHandles.entrySet()) { - constraints.put(c.getKey(), c.getValue().resolve(wc)); - } - - Scope scope = Utilities.constructScope(wc, constraints, imports); - - assert scope != null; - - Tree parsed = Utilities.parseAndAttribute(wc, to, scope); - - if (parsed.getKind() == Kind.EXPRESSION_STATEMENT && ExpressionTree.class.isAssignableFrom(tp.getLeaf().getKind().asInterface())) { - parsed = ((ExpressionStatementTree) parsed).getExpression(); - } - - Map rewriteFromTo = new IdentityHashMap(); - Tree original; - - if (Utilities.isFakeBlock(parsed)) { - TreePath parent = tp.getParentPath(); - List statements = ((BlockTree) parsed).getStatements(); - - if (tp.getLeaf().getKind() == Kind.BLOCK) { - BlockTree real = (BlockTree) tp.getLeaf(); - rewriteFromTo.put(original = real, wc.getTreeMaker().Block(statements, real.isStatic())); - } else { - statements = statements.subList(1, statements.size() - 1); - - if (parent.getLeaf().getKind() == Kind.BLOCK) { - List newStatements = new LinkedList(); - - for (StatementTree st : ((BlockTree) parent.getLeaf()).getStatements()) { - if (st == tp.getLeaf()) { - newStatements.addAll(statements); - } else { - newStatements.add(st); - } - } - - rewriteFromTo.put(original = parent.getLeaf(), wc.getTreeMaker().Block(newStatements, ((BlockTree) parent.getLeaf()).isStatic())); - } else { - rewriteFromTo.put(original = tp.getLeaf(), wc.getTreeMaker().Block(statements, false)); - } - } - } else if (Utilities.isFakeClass(parsed)) { - TreePath parent = tp.getParentPath(); - List members = ((ClassTree) parsed).getMembers(); - - members = members.subList(1, members.size()); - - assert parent.getLeaf().getKind() == Kind.CLASS; - - List newMembers = new LinkedList(); - - ClassTree ct = (ClassTree) parent.getLeaf(); - - for (Tree t : ct.getMembers()) { - if (t == tp.getLeaf()) { - newMembers.addAll(members); - } else { - newMembers.add(t); - } - } - - rewriteFromTo.put(original = parent.getLeaf(), wc.getTreeMaker().Class(ct.getModifiers(), ct.getSimpleName(), ct.getTypeParameters(), ct.getExtendsClause(), ct.getImplementsClause(), newMembers)); - } else if (tp.getLeaf().getKind() == Kind.BLOCK && parametersMulti.containsKey("$$1$") && parsed.getKind() != Kind.BLOCK && StatementTree.class.isAssignableFrom(parsed.getKind().asInterface())) { - List newStatements = new LinkedList(); - - newStatements.add(wc.getTreeMaker().ExpressionStatement(wc.getTreeMaker().Identifier("$$1$"))); - newStatements.add((StatementTree) parsed); - newStatements.add(wc.getTreeMaker().ExpressionStatement(wc.getTreeMaker().Identifier("$$2$"))); - - parsed = wc.getTreeMaker().Block(newStatements, ((BlockTree) tp.getLeaf()).isStatic()); - - rewriteFromTo.put(original = tp.getLeaf(), parsed); - } else { - while ( tp.getParentPath().getLeaf().getKind() == Kind.PARENTHESIZED - && tp.getLeaf().getKind() != parsed.getKind() - && tp.getParentPath() != null - && tp.getParentPath().getParentPath() != null - && !requiresParenthesis(parsed, tp.getParentPath().getLeaf(), tp.getParentPath().getParentPath().getLeaf()) - && requiresParenthesis(tp.getLeaf(), tp.getParentPath().getLeaf(), tp.getParentPath().getParentPath().getLeaf())) - tp = tp.getParentPath(); - rewriteFromTo.put(original = tp.getLeaf(), parsed); - } - - //prevent generating QualIdents inside import clauses - might be better to solve that inside ImportAnalysis2, - //but that seems not to be straightforward: - boolean inImport = parsed.getKind() == Kind.IMPORT; - boolean inPackage = false; - TreePath w = tp; - - while (!inImport && w != null) { - inImport |= w.getLeaf().getKind() == Kind.IMPORT; - inPackage |= w.getParentPath() != null && w.getParentPath().getLeaf().getKind() == Kind.COMPILATION_UNIT && ((CompilationUnitTree) w.getParentPath().getLeaf()).getPackageName() == w.getLeaf(); - w = w.getParentPath(); - } - - final Set originalTrees = Collections.newSetFromMap(new IdentityHashMap()); - - new TreeScanner() { - @Override public Void scan(Tree tree, Void p) { - originalTrees.add(tree); - return super.scan(tree, p); - } - }.scan(original, null); - - new ReplaceParameters(wc, ctx.isCanShowUI(), inImport, parameters, extraParamsData, parametersMulti, parameterNames, rewriteFromTo, originalTrees).scan(new TreePath(tp.getParentPath(), rewriteFromTo.get(original)), null); - - if (inPackage) { - String newPackage = wc.getTreeUtilities().translate(wc.getCompilationUnit().getPackageName(), new IdentityHashMap(rewriteFromTo))./*XXX: not correct*/toString(); - - ClassPath source = wc.getClasspathInfo().getClassPath(PathKind.SOURCE); - FileObject ownerRoot = source.findOwnerRoot(wc.getFileObject()); - - if (ownerRoot != null) { - ctx.getFileChanges().add(new MoveFile(wc.getFileObject(), ownerRoot, newPackage.replace('.', '/'))); - } else { - Logger.getLogger(JavaFix.class.getName()).log(Level.WARNING, "{0} not on its source path ({1})", new Object[] {FileUtil.getFileDisplayName(wc.getFileObject()), source.toString(PathConversionMode.PRINT)}); - } - } - - for (Entry e : rewriteFromTo.entrySet()) { - wc.rewrite(e.getKey(), e.getValue()); - } - } - } - - private static final Set NUMBER_LITERAL_KINDS = EnumSet.of(Kind.FLOAT_LITERAL, Kind.DOUBLE_LITERAL, Kind.INT_LITERAL, Kind.LONG_LITERAL); - - private static class ReplaceParameters extends TreePathScanner { - - private final CompilationInfo info; - private final TreeMaker make; - private final boolean canShowUI; - private final boolean inImport; - private final Map parameters; - private final Map extraParamsData; - private final Map> parametersMulti; - private final Map parameterNames; - private final Map rewriteFromTo; - private final Set originalTrees; - - public ReplaceParameters(WorkingCopy wc, boolean canShowUI, boolean inImport, Map parameters, Map extraParamsData, Map> parametersMulti, Map parameterNames, Map rewriteFromTo, Set originalTrees) { - this.parameters = parameters; - this.info = wc; - this.make = wc.getTreeMaker(); - this.canShowUI = canShowUI; - this.inImport = inImport; - this.extraParamsData = extraParamsData; - this.parametersMulti = parametersMulti; - this.parameterNames = parameterNames; - this.rewriteFromTo = rewriteFromTo; - this.originalTrees = originalTrees; - } - - @Override - public Number visitIdentifier(IdentifierTree node, Void p) { - String name = node.getName().toString(); - Tree newNode = handleIdentifier(name, node); - - if (newNode != null) { - rewrite(node, newNode); - if (NUMBER_LITERAL_KINDS.contains(newNode.getKind())) { - return (Number) ((LiteralTree) newNode).getValue(); - } - } - - Element e = info.getTrees().getElement(getCurrentPath()); - - if (e != null && isStaticElement(e) && !inImport) { - rewrite(node, make.QualIdent(e)); - } - - return super.visitIdentifier(node, p); - } - - @Override - public Number visitTypeParameter(TypeParameterTree node, Void p) { - String name = node.getName().toString(); - Tree newNode = handleIdentifier(name, node); - - if (newNode != null) { - rewrite(node, newNode); - if (NUMBER_LITERAL_KINDS.contains(newNode.getKind())) { - return (Number) ((LiteralTree) newNode).getValue(); - } - } - - return super.visitTypeParameter(node, p); - } - - private Tree handleIdentifier(String name, Tree node) { - TreePath tp = parameters.get(name); - - if (tp != null) { - if (tp.getLeaf() instanceof Hacks.RenameTree) { - Hacks.RenameTree rt = (Hacks.RenameTree) tp.getLeaf(); - return make.setLabel(rt.originalTree, rt.newName); - } - if (!parameterNames.containsKey(name)) { - Tree target = tp.getLeaf(); - if (NUMBER_LITERAL_KINDS.contains(target.getKind())) { - return target; - } - //TODO: might also remove parenthesis, but needs to ensure the diff will still be minimal -// while (target.getKind() == Kind.PARENTHESIZED -// && !requiresParenthesis(((ParenthesizedTree) target).getExpression(), getCurrentPath().getParentPath().getLeaf())) { -// target = ((ParenthesizedTree) target).getExpression(); -// } - if ( getCurrentPath().getParentPath() != null - && getCurrentPath().getParentPath().getLeaf().getKind() == Kind.LOGICAL_COMPLEMENT - && ( tp.getParentPath() == null - || tp.getParentPath().getLeaf().getKind() != Kind.LOGICAL_COMPLEMENT)) { - Tree negated = negate((ExpressionTree) tp.getLeaf(), getCurrentPath().getParentPath().getParentPath().getLeaf(), true); - - if (negated != null) { - rewrite(getCurrentPath().getParentPath().getLeaf(), negated); - } - } - if (requiresParenthesis(target, node, getCurrentPath().getParentPath().getLeaf())) { - target = make.Parenthesized((ExpressionTree) target); - } - return target; - } - } - - String variableName = parameterNames.get(name); - - if (variableName != null) { - return make.Identifier(variableName); - } - - return null; - } - - @Override - public Number visitMemberSelect(MemberSelectTree node, Void p) { - Element e = info.getTrees().getElement(getCurrentPath()); - - if (e != null && (e.getKind() != ElementKind.CLASS || ((TypeElement) e).asType().getKind() != TypeKind.ERROR)) { - //check correct dependency: - checkDependency(info, e, canShowUI); - - if (isStaticElement(e) && !inImport) { - rewrite(node, make.QualIdent(e)); - - return null; - } - } - - MemberSelectTree nue = node; - String selectedName = node.getIdentifier().toString(); - - if (selectedName.startsWith("$") && parameterNames.get(selectedName) != null) { - nue = make.MemberSelect(node.getExpression(), parameterNames.get(selectedName)); - } - - if (nue.getExpression().getKind() == Kind.IDENTIFIER) { - String name = ((IdentifierTree) nue.getExpression()).getName().toString(); - - if (name.startsWith("$") && parameters.get(name) == null) { - //XXX: unbound variable, use identifier instead of member select - may cause problems? - rewrite(node, make.Identifier(nue.getIdentifier())); - return null; - } - } - - if (nue != node) { - rewrite(node, nue); - } - - return super.visitMemberSelect(node, p); - } - - @Override - public Number visitVariable(VariableTree node, Void p) { - String name = node.getName().toString(); - - if (name.startsWith("$")) { - String nueName = parameterNames.get(name); - - if (nueName != null) { - name = nueName; - } - } - - VariableTree nue = make.Variable(node.getModifiers(), name, node.getType(), resolveOptionalValue(node.getInitializer())); - - rewrite(node, nue); - - return super.visitVariable(nue, p); - } - - @Override - public Number visitIf(IfTree node, Void p) { - IfTree nue = make.If(node.getCondition(), node.getThenStatement(), resolveOptionalValue(node.getElseStatement())); - - rewrite(node, nue); - - return super.visitIf(nue, p); - } - - @Override - public Number visitMethod(MethodTree node, Void p) { - String name = node.getName().toString(); - String newName = name; - - if (name.startsWith("$")) { - if (parameterNames.containsKey(name)) { - newName = parameterNames.get(name); - } - } - - List typeParams = resolveMultiParameters(node.getTypeParameters()); - List params = resolveMultiParameters(node.getParameters()); - List thrown = resolveMultiParameters(node.getThrows()); - - MethodTree nue = make.Method(node.getModifiers(), newName, node.getReturnType(), typeParams, params, thrown, node.getBody(), (ExpressionTree) node.getDefaultValue()); - - rewrite(node, nue); - - return super.visitMethod(nue, p); - } - - @Override - public Number visitClass(ClassTree node, Void p) { - String name = node.getSimpleName().toString(); - String newName = name; - - if (name.startsWith("$")) { - if (parameterNames.containsKey(name)) { - newName = parameterNames.get(name); - } - } - - List typeParams = resolveMultiParameters(node.getTypeParameters()); - List implementsClauses = resolveMultiParameters(node.getImplementsClause()); - List members = resolveMultiParameters(Utilities.filterHidden(getCurrentPath(), node.getMembers())); - Tree extend = resolveOptionalValue(node.getExtendsClause()); - ClassTree nue = make.Class(node.getModifiers(), newName, typeParams, extend, implementsClauses, members); - - rewrite(node, nue); - - return super.visitClass(nue, p); - } - - @Override - public Number visitExpressionStatement(ExpressionStatementTree node, Void p) { - CharSequence name = Utilities.getWildcardTreeName(node); - - if (name != null) { - TreePath tp = parameters.get(name.toString()); - - if (tp != null) { - rewrite(node, tp.getLeaf()); - return null; - } - } - - return super.visitExpressionStatement(node, p); - } - - @Override - public Number visitLiteral(LiteralTree node, Void p) { - if (node.getValue() instanceof Number) { - return (Number) node.getValue(); - } - - return super.visitLiteral(node, p); - } - - @Override - public Number visitBinary(BinaryTree node, Void p) { - Number left = scan(node.getLeftOperand(), p); - Number right = scan(node.getRightOperand(), p); - - if (left != null && right != null) { - Number result = null; - switch (node.getKind()) { - case MULTIPLY: - if (left instanceof Double || right instanceof Double) { - result = left.doubleValue() * right.doubleValue(); - } else if (left instanceof Float || right instanceof Float) { - result = left.floatValue() * right.floatValue(); - } else if (left instanceof Long || right instanceof Long) { - result = left.longValue() * right.longValue(); - } else if (left instanceof Integer || right instanceof Integer) { - result = left.intValue() * right.intValue(); - } else { - throw new IllegalStateException("left=" + left.getClass() + ", right=" + right.getClass()); - } - break; - - case DIVIDE: - if (left instanceof Double || right instanceof Double) { - result = left.doubleValue() / right.doubleValue(); - } else if (left instanceof Float || right instanceof Float) { - result = left.floatValue() / right.floatValue(); - } else if (left instanceof Long || right instanceof Long) { - result = left.longValue() / right.longValue(); - } else if (left instanceof Integer || right instanceof Integer) { - result = left.intValue() / right.intValue(); - } else { - throw new IllegalStateException("left=" + left.getClass() + ", right=" + right.getClass()); - } - break; - - case REMAINDER: - if (left instanceof Double || right instanceof Double) { - result = left.doubleValue() % right.doubleValue(); - } else if (left instanceof Float || right instanceof Float) { - result = left.floatValue() % right.floatValue(); - } else if (left instanceof Long || right instanceof Long) { - result = left.longValue() % right.longValue(); - } else if (left instanceof Integer || right instanceof Integer) { - result = left.intValue() % right.intValue(); - } else { - throw new IllegalStateException("left=" + left.getClass() + ", right=" + right.getClass()); - } - break; - - case PLUS: - if (left instanceof Double || right instanceof Double) { - result = left.doubleValue() + right.doubleValue(); - } else if (left instanceof Float || right instanceof Float) { - result = left.floatValue() + right.floatValue(); - } else if (left instanceof Long || right instanceof Long) { - result = left.longValue() + right.longValue(); - } else if (left instanceof Integer || right instanceof Integer) { - result = left.intValue() + right.intValue(); - } else { - throw new IllegalStateException("left=" + left.getClass() + ", right=" + right.getClass()); - } - break; - - case MINUS: - if (left instanceof Double || right instanceof Double) { - result = left.doubleValue() - right.doubleValue(); - } else if (left instanceof Float || right instanceof Float) { - result = left.floatValue() - right.floatValue(); - } else if (left instanceof Long || right instanceof Long) { - result = left.longValue() - right.longValue(); - } else if (left instanceof Integer || right instanceof Integer) { - result = left.intValue() - right.intValue(); - } else { - throw new IllegalStateException("left=" + left.getClass() + ", right=" + right.getClass()); - } - break; - - case LEFT_SHIFT: - if (left instanceof Long || right instanceof Long) { - result = left.longValue() << right.longValue(); - } else if (left instanceof Integer || right instanceof Integer) { - result = left.intValue() << right.intValue(); - } else { - throw new IllegalStateException("left=" + left.getClass() + ", right=" + right.getClass()); - } - break; - - case RIGHT_SHIFT: - if (left instanceof Long || right instanceof Long) { - result = left.longValue() >> right.longValue(); - } else if (left instanceof Integer || right instanceof Integer) { - result = left.intValue() >> right.intValue(); - } else { - throw new IllegalStateException("left=" + left.getClass() + ", right=" + right.getClass()); - } - break; - - case UNSIGNED_RIGHT_SHIFT: - if (left instanceof Long || right instanceof Long) { - result = left.longValue() >>> right.longValue(); - } else if (left instanceof Integer || right instanceof Integer) { - result = left.intValue() >>> right.intValue(); - } else { - throw new IllegalStateException("left=" + left.getClass() + ", right=" + right.getClass()); - } - break; - - case AND: - if (left instanceof Long || right instanceof Long) { - result = left.longValue() & right.longValue(); - } else if (left instanceof Integer || right instanceof Integer) { - result = left.intValue() & right.intValue(); - } else { - throw new IllegalStateException("left=" + left.getClass() + ", right=" + right.getClass()); - } - break; - - case XOR: - if (left instanceof Long || right instanceof Long) { - result = left.longValue() ^ right.longValue(); - } else if (left instanceof Integer || right instanceof Integer) { - result = left.intValue() ^ right.intValue(); - } else { - throw new IllegalStateException("left=" + left.getClass() + ", right=" + right.getClass()); - } - break; - - case OR: - if (left instanceof Long || right instanceof Long) { - result = left.longValue() | right.longValue(); - } else if (left instanceof Integer || right instanceof Integer) { - result = left.intValue() | right.intValue(); - } else { - throw new IllegalStateException("left=" + left.getClass() + ", right=" + right.getClass()); - } - break; - } - - if (result != null) { - rewrite(node, make.Literal(result)); - - return result; - } - } - - return null; - } - - @Override - public Number visitUnary(UnaryTree node, Void p) { - Number op = scan(node.getExpression(), p); - - if (op != null) { - Number result = null; - switch (node.getKind()) { - case UNARY_MINUS: - if (op instanceof Double) { - result = -op.doubleValue(); - } else if (op instanceof Float) { - result = -op.floatValue(); - } else if (op instanceof Long) { - result = -op.longValue(); - } else if (op instanceof Integer) { - result = -op.intValue(); - } else { - throw new IllegalStateException("op=" + op.getClass()); - } - break; - case UNARY_PLUS: - result = op; - break; - } - - if (result != null) { - rewrite(node, make.Literal(result)); - - return result; - } - } - - return super.visitUnary(node, p); - } - - @Override - public Number visitBlock(BlockTree node, Void p) { - List nueStatement = resolveMultiParameters(node.getStatements()); - BlockTree nue = make.Block(nueStatement, node.isStatic()); - - rewrite(node, nue); - - return super.visitBlock(nue, p); - } - - @Override - public Number visitCase(CaseTree node, Void p) { - List statements = (List) resolveMultiParameters(node.getStatements()); - CaseTree nue = make.Case(node.getExpression(), statements); - - rewrite(node, nue); - return super.visitCase(node, p); - } - - @Override - public Number visitMethodInvocation(MethodInvocationTree node, Void p) { - List typeArgs = (List) resolveMultiParameters(node.getTypeArguments()); - List args = resolveMultiParameters(node.getArguments()); - MethodInvocationTree nue = make.MethodInvocation(typeArgs, node.getMethodSelect(), args); - - rewrite(node, nue); - - return super.visitMethodInvocation(nue, p); - } - - @Override - public Number visitNewClass(NewClassTree node, Void p) { - List typeArgs = (List) resolveMultiParameters(node.getTypeArguments()); - List args = resolveMultiParameters(node.getArguments()); - NewClassTree nue = make.NewClass(node.getEnclosingExpression(), typeArgs, node.getIdentifier(), args, node.getClassBody()); - - rewrite(node, nue); - return super.visitNewClass(nue, p); - } - - @Override - public Number visitParameterizedType(ParameterizedTypeTree node, Void p) { - List typeArgs = (List) resolveMultiParameters(node.getTypeArguments()); - ParameterizedTypeTree nue = make.ParameterizedType(node.getType(), typeArgs); - - rewrite(node, nue); - return super.visitParameterizedType(node, p); - } - - @Override - public Number visitSwitch(SwitchTree node, Void p) { - List cases = (List) resolveMultiParameters(node.getCases()); - SwitchTree nue = make.Switch(node.getExpression(), cases); - - rewrite(node, nue); - return super.visitSwitch(node, p); - } - - @Override - public Number visitTry(TryTree node, Void p) { - List resources = (List) resolveMultiParameters(node.getResources()); - List catches = (List) resolveMultiParameters(node.getCatches()); - TryTree nue = make.Try(resources, node.getBlock(), catches, node.getFinallyBlock()); - - rewrite(node, nue); - return super.visitTry(node, p); - } - - @Override - public Number visitModifiers(ModifiersTree node, Void p) { - List annotations = new ArrayList(node.getAnnotations()); - IdentifierTree ident = !annotations.isEmpty() && annotations.get(0).getAnnotationType().getKind() == Kind.IDENTIFIER ? (IdentifierTree) annotations.get(0).getAnnotationType() : null; - - if (ident != null) { - annotations.remove(0); - - String name = ident.getName().toString(); - TreePath orig = parameters.get(name); - ModifiersTree nue; - - if (orig != null && orig.getLeaf().getKind() == Kind.MODIFIERS) { - ModifiersTree origMods = (ModifiersTree) orig.getLeaf(); - Object actualContent = extraParamsData.get(name); - Set actualFlags = EnumSet.noneOf(Modifier.class); - boolean[] actualAnnotationsMask = new boolean[0]; - - if (actualContent instanceof Object[] && ((Object[]) actualContent)[0] instanceof Set) { - actualFlags.addAll(NbCollections.checkedSetByFilter((Set) ((Object[]) actualContent)[0], Modifier.class, false)); - } - - if (actualContent instanceof Object[] && ((Object[]) actualContent)[1] instanceof boolean[]) { - actualAnnotationsMask = (boolean[]) ((Object[]) actualContent)[1]; - } - - nue = origMods; - - for (Modifier m : origMods.getFlags()) { - if (actualFlags.contains(m)) continue; - nue = make.removeModifiersModifier(nue, m); - } - - for (Modifier m : node.getFlags()) { - nue = make.addModifiersModifier(nue, m); - } - - int ai = 0; - - OUTER: for (AnnotationTree a : origMods.getAnnotations()) { - if (actualAnnotationsMask.length <= ai || actualAnnotationsMask[ai++]) continue; - for (Iterator it = annotations.iterator(); it.hasNext();) { - AnnotationTree toCheck = it.next(); - Collection match = org.netbeans.api.java.source.matching.Matcher.create(info).setTreeTopSearch().setSearchRoot(new TreePath(getCurrentPath(), a)).match(Pattern.createSimplePattern(new TreePath(getCurrentPath(), toCheck))); - - if (!match.isEmpty()) { - //should be kept: - it.remove(); - break OUTER; - } - } - - nue = make.removeModifiersAnnotation(nue, a); - } - - for (AnnotationTree a : annotations) { - nue = make.addModifiersAnnotation(nue, a); - scan(a, p); - } - } else { - nue = make.removeModifiersAnnotation(node, 0); - } - - rewrite(node, nue); - - return null; - } - - return super.visitModifiers(node, p); - } - - @Override - public Number visitNewArray(NewArrayTree node, Void p) { - List dimensions = (List) resolveMultiParameters(node.getDimensions()); - List initializers = (List) resolveMultiParameters(node.getInitializers()); - NewArrayTree nue = make.NewArray(node.getType(), dimensions, initializers); - - rewrite(node, nue); - return super.visitNewArray(node, p); - } - - @Override - public Number visitLambdaExpression(LambdaExpressionTree node, Void p) { - List args = resolveMultiParameters(node.getParameters()); - LambdaExpressionTree nue = make.LambdaExpression(args, node.getBody()); - - rewrite(node, nue); - - return super.visitLambdaExpression(node, p); - } - - @Override - public Number visitAnnotation(AnnotationTree node, Void p) { - List args = resolveMultiParameters(node.getArguments()); - AnnotationTree nue = make.Annotation(node.getAnnotationType(), args); - - rewrite(node, nue); - - return super.visitAnnotation(node, p); - } - - private List resolveMultiParameters(List list) { - if (list == null) return null; - if (!Utilities.containsMultistatementTrees(list)) return list; - - List result = new LinkedList(); - - for (T t : list) { - if (Utilities.isMultistatementWildcardTree(t)) { - Collection embedded = parametersMulti.get(Utilities.getWildcardTreeName(t).toString()); - - if (embedded != null) { - for (TreePath tp : embedded) { - result.add((T) tp.getLeaf()); - } - } - } else { - result.add(t); - } - } - - return result; - } - - private T resolveOptionalValue(T in) { - if (in != null && Utilities.isMultistatementWildcardTree(in)) { - TreePath out = parameters.get(Utilities.getWildcardTreeName(in).toString()); - if (out != null) return (T) out.getLeaf(); - return null; - } - - return in; - } - - private ExpressionTree negate(ExpressionTree original, Tree parent, boolean nullOnPlainNeg) { - ExpressionTree newTree; - switch (original.getKind()) { - case PARENTHESIZED: - ExpressionTree expr = ((ParenthesizedTree) original).getExpression(); - return make.Parenthesized(negate(expr, original, nullOnPlainNeg)); - case LOGICAL_COMPLEMENT: - newTree = ((UnaryTree) original).getExpression(); - while (newTree.getKind() == Kind.PARENTHESIZED && !JavaFixUtilities.requiresParenthesis(((ParenthesizedTree) newTree).getExpression(), original, parent)) { - newTree = ((ParenthesizedTree) newTree).getExpression(); - } - break; - case NOT_EQUAL_TO: - newTree = negateBinaryOperator(original, Kind.EQUAL_TO, false); - break; - case EQUAL_TO: - newTree = negateBinaryOperator(original, Kind.NOT_EQUAL_TO, false); - break; - case BOOLEAN_LITERAL: - newTree = make.Literal(!(Boolean) ((LiteralTree) original).getValue()); - break; - case CONDITIONAL_AND: - newTree = negateBinaryOperator(original, Kind.CONDITIONAL_OR, true); - break; - case CONDITIONAL_OR: - newTree = negateBinaryOperator(original, Kind.CONDITIONAL_AND, true); - break; - case LESS_THAN: - newTree = negateBinaryOperator(original, Kind.GREATER_THAN_EQUAL, false); - break; - case LESS_THAN_EQUAL: - newTree = negateBinaryOperator(original, Kind.GREATER_THAN, false); - break; - case GREATER_THAN: - newTree = negateBinaryOperator(original, Kind.LESS_THAN_EQUAL, false); - break; - case GREATER_THAN_EQUAL: - newTree = negateBinaryOperator(original, Kind.LESS_THAN, false); - break; - default: - if (nullOnPlainNeg) - return null; - newTree = make.Unary(Kind.LOGICAL_COMPLEMENT, original); - } - - if (JavaFixUtilities.requiresParenthesis(newTree, original, parent)) { - newTree = make.Parenthesized(newTree); - } - - return newTree; - } - - private ExpressionTree negateBinaryOperator(Tree original, Kind newKind, boolean negateOperands) { - BinaryTree bt = (BinaryTree) original; - BinaryTree nonNegated = make.Binary(newKind, - bt.getLeftOperand(), - bt.getRightOperand()); - if (negateOperands) { - ExpressionTree lo = negate(bt.getLeftOperand(), nonNegated, false); - ExpressionTree ro = negate(bt.getRightOperand(), nonNegated, false); - return make.Binary(newKind, - lo != null ? lo : bt.getLeftOperand(), - ro != null ? ro : bt.getRightOperand()); - } - return nonNegated; - } - - private void rewrite(Tree from, Tree to) { - if (originalTrees.contains(from)) return ; - rewriteFromTo.put(from, to); - } - } - - private static final Map OPERATOR_PRIORITIES; - - static { - OPERATOR_PRIORITIES = new EnumMap(Kind.class); - - OPERATOR_PRIORITIES.put(Kind.IDENTIFIER, 0); - - for (Kind k : Kind.values()) { - if (k.asInterface() == LiteralTree.class) { - OPERATOR_PRIORITIES.put(k, 0); - } - } - - OPERATOR_PRIORITIES.put(Kind.ARRAY_ACCESS, 1); - OPERATOR_PRIORITIES.put(Kind.METHOD_INVOCATION, 1); - OPERATOR_PRIORITIES.put(Kind.MEMBER_SELECT, 1); - OPERATOR_PRIORITIES.put(Kind.POSTFIX_DECREMENT, 1); - OPERATOR_PRIORITIES.put(Kind.POSTFIX_INCREMENT, 1); - OPERATOR_PRIORITIES.put(Kind.NEW_ARRAY, 1); - OPERATOR_PRIORITIES.put(Kind.NEW_CLASS, 1); - - OPERATOR_PRIORITIES.put(Kind.BITWISE_COMPLEMENT, 2); - OPERATOR_PRIORITIES.put(Kind.LOGICAL_COMPLEMENT, 2); - OPERATOR_PRIORITIES.put(Kind.PREFIX_DECREMENT, 2); - OPERATOR_PRIORITIES.put(Kind.PREFIX_INCREMENT, 2); - OPERATOR_PRIORITIES.put(Kind.UNARY_MINUS, 2); - OPERATOR_PRIORITIES.put(Kind.UNARY_PLUS, 2); - - OPERATOR_PRIORITIES.put(Kind.TYPE_CAST, 3); - - OPERATOR_PRIORITIES.put(Kind.DIVIDE, 4); - OPERATOR_PRIORITIES.put(Kind.MULTIPLY, 4); - OPERATOR_PRIORITIES.put(Kind.REMAINDER, 4); - - OPERATOR_PRIORITIES.put(Kind.MINUS, 5); - OPERATOR_PRIORITIES.put(Kind.PLUS, 5); - - OPERATOR_PRIORITIES.put(Kind.LEFT_SHIFT, 6); - OPERATOR_PRIORITIES.put(Kind.RIGHT_SHIFT, 6); - OPERATOR_PRIORITIES.put(Kind.UNSIGNED_RIGHT_SHIFT, 6); - - OPERATOR_PRIORITIES.put(Kind.INSTANCE_OF, 7); - OPERATOR_PRIORITIES.put(Kind.GREATER_THAN, 7); - OPERATOR_PRIORITIES.put(Kind.GREATER_THAN_EQUAL, 7); - OPERATOR_PRIORITIES.put(Kind.LESS_THAN, 7); - OPERATOR_PRIORITIES.put(Kind.LESS_THAN_EQUAL, 7); - - OPERATOR_PRIORITIES.put(Kind.EQUAL_TO, 8); - OPERATOR_PRIORITIES.put(Kind.NOT_EQUAL_TO, 8); - - OPERATOR_PRIORITIES.put(Kind.AND, 9); - OPERATOR_PRIORITIES.put(Kind.OR, 11); - OPERATOR_PRIORITIES.put(Kind.XOR, 10); - - OPERATOR_PRIORITIES.put(Kind.CONDITIONAL_AND, 12); - OPERATOR_PRIORITIES.put(Kind.CONDITIONAL_OR, 13); - - OPERATOR_PRIORITIES.put(Kind.CONDITIONAL_EXPRESSION, 14); - - OPERATOR_PRIORITIES.put(Kind.AND_ASSIGNMENT, 15); - OPERATOR_PRIORITIES.put(Kind.ASSIGNMENT, 15); - OPERATOR_PRIORITIES.put(Kind.DIVIDE_ASSIGNMENT, 15); - OPERATOR_PRIORITIES.put(Kind.LEFT_SHIFT_ASSIGNMENT, 15); - OPERATOR_PRIORITIES.put(Kind.MINUS_ASSIGNMENT, 15); - OPERATOR_PRIORITIES.put(Kind.MULTIPLY_ASSIGNMENT, 15); - OPERATOR_PRIORITIES.put(Kind.OR_ASSIGNMENT, 15); - OPERATOR_PRIORITIES.put(Kind.PLUS_ASSIGNMENT, 15); - OPERATOR_PRIORITIES.put(Kind.REMAINDER_ASSIGNMENT, 15); - OPERATOR_PRIORITIES.put(Kind.RIGHT_SHIFT_ASSIGNMENT, 15); - OPERATOR_PRIORITIES.put(Kind.UNSIGNED_RIGHT_SHIFT_ASSIGNMENT, 15); - OPERATOR_PRIORITIES.put(Kind.XOR_ASSIGNMENT, 15); - } - - /**Checks whether putting {@code inner} tree into {@code outter} tree, - * when {@code original} is being replaced with {@code inner} requires parentheses. - * - * @param inner the new tree node that will be placed under {@code outter} - * @param original the tree node that is being replaced with {@code inner} - * @param outter the future parent node of {@code inner} - * @return true if and only if inner needs to be wrapped using {@link TreeMaker#Parenthesized(com.sun.source.tree.ExpressionTree) } - * to keep the original meaning. - */ - public static boolean requiresParenthesis(Tree inner, Tree original, Tree outter) { - if (!ExpressionTree.class.isAssignableFrom(inner.getKind().asInterface())) return false; - if (!ExpressionTree.class.isAssignableFrom(outter.getKind().asInterface())) return false; - - if (outter.getKind() == Kind.PARENTHESIZED || inner.getKind() == Kind.PARENTHESIZED) return false; - - if (outter.getKind() == Kind.METHOD_INVOCATION) { - if (((MethodInvocationTree) outter).getArguments().contains(original)) return false; - } - - if (outter.getKind() == Kind.NEW_CLASS) { - if (((NewClassTree) outter).getArguments().contains(original)) return false; - } - - Integer innerPriority = OPERATOR_PRIORITIES.get(inner.getKind()); - Integer outterPriority = OPERATOR_PRIORITIES.get(outter.getKind()); - - if (innerPriority == null || outterPriority == null) { - Logger.getLogger(JavaFix.class.getName()).log(Level.WARNING, "Unknown tree kind(s): {0}/{1}", new Object[] {inner.getKind(), outter.getKind()}); - return true; - } - - if (innerPriority > outterPriority) { - return true; - } - - if (innerPriority < outterPriority) { - return false; - } - - //associativity - if (BinaryTree.class.isAssignableFrom(outter.getKind().asInterface())) { - BinaryTree ot = (BinaryTree) outter; - - //TODO: for + it might be possible to skip the parenthesis: - return ot.getRightOperand() == original; - } - - if (CompoundAssignmentTree.class.isAssignableFrom(outter.getKind().asInterface())) { - CompoundAssignmentTree ot = (CompoundAssignmentTree) outter; - - return ot.getVariable() == original; - } - - if (AssignmentTree.class.isAssignableFrom(outter.getKind().asInterface())) { - AssignmentTree ot = (AssignmentTree) outter; - - return ot.getVariable() == original; - } - - return false; - } - - private static final class RemoveFromParent extends JavaFix { - - private final String displayName; - - public RemoveFromParent(String displayName, CompilationInfo info, TreePath toRemove) { - super(info, toRemove); - this.displayName = displayName; - } - - @Override - protected String getText() { - return displayName; - } - - @Override - protected void performRewrite(TransformationContext ctx) { - WorkingCopy wc = ctx.getWorkingCopy(); - TreePath tp = ctx.getPath(); - - doRemoveFromParent(wc, tp); - } - - private void doRemoveFromParent(WorkingCopy wc, TreePath what) { - TreeMaker make = wc.getTreeMaker(); - Tree leaf = what.getLeaf(); - Tree parentLeaf = what.getParentPath().getLeaf(); - - switch (parentLeaf.getKind()) { - case ANNOTATION: - AnnotationTree at = (AnnotationTree) parentLeaf; - AnnotationTree newAnnot; - - newAnnot = make.removeAnnotationAttrValue(at, (ExpressionTree) leaf); - - wc.rewrite(at, newAnnot); - break; - case BLOCK: - BlockTree bt = (BlockTree) parentLeaf; - - wc.rewrite(bt, make.removeBlockStatement(bt, (StatementTree) leaf)); - break; - case CASE: - CaseTree caseTree = (CaseTree) parentLeaf; - - wc.rewrite(caseTree, make.removeCaseStatement(caseTree, (StatementTree) leaf)); - break; - case CLASS: - ClassTree classTree = (ClassTree) parentLeaf; - ClassTree nueClassTree; - - if (classTree.getTypeParameters().contains(leaf)) { - nueClassTree = make.removeClassTypeParameter(classTree, (TypeParameterTree) leaf); - } else if (classTree.getExtendsClause() == leaf) { - nueClassTree = make.Class(classTree.getModifiers(), classTree.getSimpleName(), classTree.getTypeParameters(), null, classTree.getImplementsClause(), classTree.getMembers()); - } else if (classTree.getImplementsClause().contains(leaf)) { - nueClassTree = make.removeClassImplementsClause(classTree, leaf); - } else if (classTree.getMembers().contains(leaf)) { - nueClassTree = make.removeClassMember(classTree, leaf); - } else { - throw new UnsupportedOperationException(); - } - - wc.rewrite(classTree, nueClassTree); - break; - case UNION_TYPE: - UnionTypeTree disjunct = (UnionTypeTree) parentLeaf; - List alternatives = new LinkedList(disjunct.getTypeAlternatives()); - - alternatives.remove(leaf); - - wc.rewrite(disjunct, make.UnionType(alternatives)); - break; - case METHOD: - MethodTree mTree = (MethodTree) parentLeaf; - MethodTree newMethod; - - if (mTree.getTypeParameters().contains(leaf)) { - newMethod = make.removeMethodTypeParameter(mTree, (TypeParameterTree) leaf); - } else if (mTree.getParameters().contains(leaf)) { - newMethod = make.removeMethodParameter(mTree, (VariableTree) leaf); - } else if (mTree.getThrows().contains(leaf)) { - newMethod = make.removeMethodThrows(mTree, (ExpressionTree) leaf); - } else { - throw new UnsupportedOperationException(); - } - - wc.rewrite(mTree, newMethod); - break; - case METHOD_INVOCATION: - MethodInvocationTree iTree = (MethodInvocationTree) parentLeaf; - MethodInvocationTree newInvocation; - - if (iTree.getTypeArguments().contains(leaf)) { - newInvocation = make.removeMethodInvocationTypeArgument(iTree, (ExpressionTree) leaf); - } else if (iTree.getArguments().contains(leaf)) { - newInvocation = make.removeMethodInvocationArgument(iTree, (ExpressionTree) leaf); - } else { - throw new UnsupportedOperationException(); - } - - wc.rewrite(iTree, newInvocation); - break; - case MODIFIERS: - ModifiersTree modsTree = (ModifiersTree) parentLeaf; - - wc.rewrite(modsTree, make.removeModifiersAnnotation(modsTree, (AnnotationTree) leaf)); - break; - case NEW_CLASS: - NewClassTree newCTree = (NewClassTree) parentLeaf; - NewClassTree newNCT; - - if (newCTree.getTypeArguments().contains(leaf)) { - newNCT = make.removeNewClassTypeArgument(newCTree, (ExpressionTree) leaf); - } else if (newCTree.getArguments().contains(leaf)) { - newNCT = make.removeNewClassArgument(newCTree, (ExpressionTree) leaf); - } else { - throw new UnsupportedOperationException(); - } - - wc.rewrite(newCTree, newNCT); - break; - case PARAMETERIZED_TYPE: - ParameterizedTypeTree parTree = (ParameterizedTypeTree) parentLeaf; - - wc.rewrite(parTree, make.removeParameterizedTypeTypeArgument(parTree, (ExpressionTree) leaf)); - break; - case SWITCH: - SwitchTree switchTree = (SwitchTree) parentLeaf; - SwitchTree newSwitch; - - if (switchTree.getCases().contains(leaf)) { - newSwitch = make.removeSwitchCase(switchTree, (CaseTree) leaf); - } else { - throw new UnsupportedOperationException(); - } - - wc.rewrite(switchTree, newSwitch); - break; - case TRY: - TryTree tryTree = (TryTree) parentLeaf; - TryTree newTry; - - if (tryTree.getResources().contains(leaf)) { - LinkedList resources = new LinkedList(tryTree.getResources()); - - resources.remove(leaf); - - newTry = make.Try(resources, tryTree.getBlock(), tryTree.getCatches(), tryTree.getFinallyBlock()); - } else if (tryTree.getCatches().contains(leaf)) { - newTry = make.removeTryCatch(tryTree, (CatchTree) leaf); - } else { - throw new UnsupportedOperationException(); - } - - wc.rewrite(tryTree, newTry); - break; - case EXPRESSION_STATEMENT: - doRemoveFromParent(wc, what.getParentPath()); - break; - default: - wc.rewrite(what.getLeaf(), make.Block(Collections.emptyList(), false)); - break; - } - } - - } - - //TODO: from FileMovePlugin - private static class MoveFile extends SimpleRefactoringElementImplementation { - - private FileObject toMove; - private final FileObject sourceRoot; - private final String targetFolderName; - - public MoveFile(FileObject toMove, FileObject sourceRoot, String targetFolderName) { - this.toMove = toMove; - this.sourceRoot = sourceRoot; - this.targetFolderName = targetFolderName; - } - - @Override - @Messages({"#{0} - original file name", "TXT_MoveFile=Move {0}"}) - public String getText() { - return Bundle.TXT_MoveFile(toMove.getNameExt()); - } - - @Override - public String getDisplayText() { - return getText(); - } - - DataFolder sourceFolder; - DataObject source; - @Override - public void performChange() { - try { - FileObject target = FileUtil.createFolder(sourceRoot, targetFolderName); - DataFolder targetFolder = DataFolder.findFolder(target); - if (!toMove.isValid()) { - String path = FileUtil.getFileDisplayName(toMove); - Logger.getLogger(JavaFix.class.getName()).fine("Invalid FileObject " + path + "trying to recreate..."); - toMove = FileUtil.toFileObject(FileUtil.toFile(toMove)); - if (toMove==null) { - Logger.getLogger(JavaFix.class.getName()).severe("Invalid FileObject " + path + "\n. File not found."); - return; - } - } - source = DataObject.find(toMove); - sourceFolder = source.getFolder(); - source.move(targetFolder); - } catch (DataObjectNotFoundException ex) { - ex.printStackTrace(); - } catch (IOException ex) { - ex.printStackTrace(); - } - } - - @Override - public void undoChange() { - try { - source.move(sourceFolder); - } catch (DataObjectNotFoundException ex) { - ex.printStackTrace(); - } catch (IOException ex) { - ex.printStackTrace(); - } - } - - @Override - public Lookup getLookup() { - return Lookup.EMPTY; - } - - @Override - public FileObject getParentFile() { - return toMove; - } - - @Override - public PositionBounds getPosition() { - return null; - } - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/MatcherUtilities.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/MatcherUtilities.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,157 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.spi.java.hints; - -import com.sun.source.tree.BlockTree; -import com.sun.source.tree.Scope; -import com.sun.source.tree.StatementTree; -import com.sun.source.tree.Tree; -import com.sun.source.util.TreePath; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.lang.model.type.TypeMirror; -import org.netbeans.api.annotations.common.NonNull; -import org.netbeans.modules.java.hints.spiimpl.Utilities; -import org.netbeans.modules.java.hints.spiimpl.pm.PatternCompiler; -import org.netbeans.api.java.source.matching.Matcher; -import org.netbeans.api.java.source.matching.Occurrence; -import org.netbeans.api.java.source.matching.Pattern; - -/**XXX: cancelability - * TODO: needed? - * - * @author lahvac - */ -public class MatcherUtilities { - - public static boolean matches(@NonNull HintContext ctx, @NonNull TreePath variable, @NonNull String pattern) { - return matches(ctx, variable, pattern, null, null, null); - } - - public static boolean matches(@NonNull HintContext ctx, @NonNull TreePath variable, @NonNull String pattern, boolean fillInVariablesHack) { - return matches(ctx, variable, pattern, ctx.getVariables(), ctx.getMultiVariables(), ctx.getVariableNames()); - } - - public static boolean matches(@NonNull HintContext ctx, @NonNull TreePath variable, @NonNull String pattern, Map outVariables, Map> outMultiVariables, Map outVariables2Names) { - Pattern p = PatternCompiler.compile(ctx.getInfo(), pattern, Collections.emptyMap(), Collections.emptyList()); - Map variables = new HashMap(ctx.getVariables()); - Map> multiVariables = new HashMap>(ctx.getMultiVariables()); - Map variables2Names = new HashMap(ctx.getVariableNames()); - Iterable occurrences = Matcher.create(ctx.getInfo()).setCancel(new AtomicBoolean()).setPresetVariable(variables, multiVariables, variables2Names).setSearchRoot(variable).setTreeTopSearch().match(p); - - if (occurrences.iterator().hasNext()) { - Occurrence od = occurrences.iterator().next(); - outVariables(outVariables, od.getVariables(), ctx.getVariables()); - outVariables(outMultiVariables, od.getMultiVariables(), ctx.getMultiVariables()); - outVariables(outVariables2Names, od.getVariables2Names(), ctx.getVariableNames()); - - return true; - } - - return false; - } - - public static boolean matches(@NonNull HintContext ctx, @NonNull Collection variable, @NonNull String pattern, Map outVariables, Map> outMultiVariables, Map outVariables2Names) { - Scope s = Utilities.constructScope(ctx.getInfo(), Collections.emptyMap()); - Tree patternTree = Utilities.parseAndAttribute(ctx.getInfo(), pattern, s); - List patternTrees; - - if (Utilities.isFakeBlock(patternTree)) { - List statements = ((BlockTree) patternTree).getStatements(); - - patternTrees = statements.subList(1, statements.size() - 1); - } else { - patternTrees = Collections.singletonList(patternTree); - } - - if (variable.size() != patternTrees.size()) return false; - - Map variables = new HashMap(ctx.getVariables()); - Map> multiVariables = new HashMap>(ctx.getMultiVariables()); - Map variables2Names = new HashMap(ctx.getVariableNames()); - Iterator variableIt = variable.iterator(); - Iterator patternTreesIt = patternTrees.iterator(); - - while (variableIt.hasNext() && patternTreesIt.hasNext()) { - TreePath patternTreePath = new TreePath(new TreePath(ctx.getInfo().getCompilationUnit()), patternTreesIt.next()); - Pattern p = Pattern.createPatternWithFreeVariables(patternTreePath, Collections.emptyMap()); - Iterable occurrences = Matcher.create(ctx.getInfo()).setCancel(new AtomicBoolean()).setPresetVariable(variables, multiVariables, variables2Names).setSearchRoot(variableIt.next()).setTreeTopSearch().match(p); - - if (!occurrences.iterator().hasNext()) { - return false; - } - - Occurrence od = occurrences.iterator().next(); - - variables = od.getVariables(); - multiVariables = od.getMultiVariables(); - variables2Names = od.getVariables2Names(); - } - - if (variableIt.hasNext() == patternTreesIt.hasNext()) { - outVariables(outVariables, variables, ctx.getVariables()); - outVariables(outMultiVariables, multiVariables, ctx.getMultiVariables()); - outVariables(outVariables2Names, variables2Names, ctx.getVariableNames()); - - return true; - } - - return false; - } - - private static void outVariables(Map outMap, Map currentValues, Map origValues) { - if (outMap == null) return; - - for (String key : origValues.keySet()) { - currentValues.remove(key); - } - - outMap.putAll(currentValues); - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/TriggerDecision.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/TriggerDecision.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.spi.java.hints; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * @author lahvac - */ -@Retention(RetentionPolicy.SOURCE) -@Target(ElementType.METHOD) -public @interface TriggerDecision { - - public Class> value(); - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/TriggerPattern.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/TriggerPattern.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,93 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.spi.java.hints; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import org.netbeans.spi.editor.hints.ErrorDescription; - -/**Find parts of the source code that satisfy the given pattern, and invoke the method - * that is annotated with this annotation. - * - * The method must be {@code public static}, the return type must either be assignable to - * {@link ErrorDescription} or to {@link Iterable}{@code }. - * Its sole parameter must be {@link HintContext}. - * - * @author lahvac - */ -@Retention(RetentionPolicy.SOURCE) -@Target(ElementType.METHOD) -public @interface TriggerPattern { - - /** - * Pattern to match on. - * The pattern consists of: - *
      - *
    • a single Java expression
      • - *
    • a single Java statement
      • - *
    • multiple Java statements
      • - *
    • a Java field, method or class
      • - *
    - * - * Variables (identifiers starting with {@code $}) can be used to replace part of the pattern. - * During matching, the actual part of the AST that corresponds to the variable in the pattern - * will be "bound" to the variable. Variables whose names that do not end with a {@code $} ("single" variables) - * will be bound to exactly one AST node, whereas variables whose names end with a {@code $} ("multi" variables) - * will be bound to any number of consecutive AST nodes (with the same AST node as a parent). - * - * The actual AST nodes that were bound to single variables are available through {@link HintContext#getVariables() }, - * nodes bound to multi variables are available through {@link HintContext#getMultiVariables() }. - * - * For variables that represent an expression, a type constraint can be specified using the - * {@link #constraints() } attribute. - * - * All classes should be referred to using FQNs. - */ - public String value(); - /**Expected types for variables from the {@link #value() pattern}. - */ - public ConstraintVariableType[] constraints() default {}; - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/TriggerPatterns.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/TriggerPatterns.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.spi.java.hints; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/**Multiple {@link TriggerPattern}s. - * - * @author lahvac - */ -@Retention(RetentionPolicy.SOURCE) -@Target(ElementType.METHOD) -public @interface TriggerPatterns { - - public TriggerPattern[] value(); - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/TriggerTreeKind.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/TriggerTreeKind.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.spi.java.hints; - -import com.sun.source.tree.Tree.Kind; -import com.sun.source.util.TreePath; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/**Invoke the method for {@link TreePath}s of the given kind. - * - * The method must be {@code public static}, the return type must either be assignable to - * {@link ErrorDescription} or to {@link Iterable}{@code }. - * Its sole parameter must be {@link HintContext}. - * - * @author lahvac - */ -@Retention(RetentionPolicy.SOURCE) -@Target(ElementType.METHOD) -public @interface TriggerTreeKind { - - public Kind[] value(); - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/UseOptions.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/UseOptions.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2012 Sun Microsystems, Inc. - */ -package org.netbeans.spi.java.hints; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/**Specifies which options from the enclosing class should be used for this hint. - * - * Only applies to methods marked with the {@link Hint} annotation. - * - * @author lahvac - */ -@Retention(RetentionPolicy.SOURCE) -@Target(ElementType.METHOD) -public @interface UseOptions { - - /**Keys (values of the compile-time constants) of the options that should be used - * for this hint method. - */ - public String[] value(); - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/support/FixFactory.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/support/FixFactory.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): - * - * Portions Copyrighted 2007-2012 Sun Microsystems, Inc. - */ -package org.netbeans.spi.java.hints.support; - -import com.sun.source.tree.ModifiersTree; -import com.sun.source.tree.Tree.Kind; -import com.sun.source.util.TreePath; -import java.util.Collections; -import java.util.EnumSet; -import java.util.Set; -import javax.lang.model.element.Modifier; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.TreeMaker; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.api.java.source.WorkingCopy; -import org.netbeans.spi.editor.hints.Fix; -import org.netbeans.spi.java.hints.JavaFix; -import org.openide.util.Parameters; - -/** Factory for creating generally useful fixes. Currently, changes to the modifiers - * are supported. - * - * @author Dusan Balek - */ -public final class FixFactory { - - private FixFactory() {} - - /** Creates a fix, which when invoked adds a set of modifiers to the existing ones - * @param compilationInfo CompilationInfo to work on - * @param treePath TreePath to a ModifiersTree. - * @param toAdd set of Modifiers to add - * @param text text displayed as a fix description - */ - public static final Fix addModifiersFix(CompilationInfo compilationInfo, TreePath treePath, Set toAdd, String text) { - Parameters.notNull("compilationInfo", compilationInfo); - Parameters.notNull("treePath", treePath); - Parameters.notNull("toAdd", toAdd); - Parameters.notNull("text", text); - - return changeModifiersFix(compilationInfo, treePath, toAdd, Collections.emptySet(), text); - } - - /** Creates a fix, which when invoked removes a set of modifiers from the existing ones - * @param compilationInfo CompilationInfo to work on - * @param treePath TreePath to a ModifiersTree. - * @param toRemove set of Modifiers to remove - * @param text text displayed as a fix description - */ - public static final Fix removeModifiersFix(CompilationInfo compilationInfo, TreePath treePath, Set toRemove, String text) { - Parameters.notNull("compilationInfo", compilationInfo); - Parameters.notNull("treePath", treePath); - Parameters.notNull("toRemove", toRemove); - Parameters.notNull("text", text); - - return changeModifiersFix(compilationInfo, treePath, Collections.emptySet(), toRemove, text); - } - - /** Creates a fix, which when invoked changes the existing modifiers - * @param compilationInfo CompilationInfo to work on - * @param treePath TreePath to a ModifiersTree. - * @param toAdd set of Modifiers to add - * @param toRemove set of Modifiers to remove - * @param text text displayed as a fix description - */ - public static final Fix changeModifiersFix(CompilationInfo compilationInfo, TreePath treePath, Set toAdd, Set toRemove, String text) { - Parameters.notNull("compilationInfo", compilationInfo); - Parameters.notNull("treePath", treePath); - Parameters.notNull("toAdd", toAdd); - Parameters.notNull("toRemove", toRemove); - Parameters.notNull("text", text); - - if (treePath.getLeaf().getKind() != Kind.MODIFIERS) { - return null; - } - return new ChangeModifiersFixImpl(TreePathHandle.create(treePath, compilationInfo), toAdd, toRemove, text).toEditorFix(); - } - - private static final class ChangeModifiersFixImpl extends JavaFix { - - private final TreePathHandle modsHandle; - private final Set toAdd; - private final Set toRemove; - private final String text; - - public ChangeModifiersFixImpl(TreePathHandle modsHandle, Set toAdd, Set toRemove, String text) { - super(modsHandle); - this.modsHandle = modsHandle; - this.toAdd = toAdd; - this.toRemove = toRemove; - this.text = text; - } - - public String getText() { - return text; - } - - @Override - protected void performRewrite(TransformationContext ctx) { - WorkingCopy wc = ctx.getWorkingCopy(); - TreePath path = ctx.getPath(); - TreeMaker make = wc.getTreeMaker(); - ModifiersTree newMods = (ModifiersTree) path.getLeaf(); - for (Modifier a : toAdd) { - newMods = make.addModifiersModifier(newMods, a); - } - for (Modifier r : toRemove) { - newMods = make.removeModifiersModifier(newMods, r); - } - wc.rewrite(path.getLeaf(), newMods); - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final ChangeModifiersFixImpl other = (ChangeModifiersFixImpl) obj; - if (this.modsHandle != other.modsHandle && (this.modsHandle == null || !this.modsHandle.equals(other.modsHandle))) { - return false; - } - if (this.toAdd != other.toAdd && (this.toAdd == null || !this.toAdd.equals(other.toAdd))) { - return false; - } - if (this.toRemove != other.toRemove && (this.toRemove == null || !this.toRemove.equals(other.toRemove))) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 5; - hash = 71 * hash + (this.modsHandle != null ? this.modsHandle.hashCode() : 0); - hash = 71 * hash + (this.toAdd != null ? this.toAdd.hashCode() : 0); - hash = 71 * hash + (this.toRemove != null ? this.toRemove.hashCode() : 0); - return hash; - } - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/support/TransformationSupport.java --- a/sandbox/java.hints/spi.java.hints/src/org/netbeans/spi/java/hints/support/TransformationSupport.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,311 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2012 Sun Microsystems, Inc. - */ -package org.netbeans.spi.java.hints.support; - -import com.sun.source.util.TreePath; -import java.util.*; -import java.util.Map.Entry; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.lang.model.type.TypeMirror; -import org.netbeans.api.annotations.common.NonNull; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.ModificationResult; -import org.netbeans.api.java.source.TypeMirrorHandle; -import org.netbeans.api.java.source.WorkingCopy; -import org.netbeans.api.java.source.matching.Matcher; -import org.netbeans.api.java.source.matching.Occurrence; -import org.netbeans.api.java.source.matching.Pattern; -import org.netbeans.api.project.Project; -import org.netbeans.modules.java.hints.jackpot.spi.PatternConvertor; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import org.netbeans.modules.java.hints.providers.spi.HintDescriptionFactory; -import org.netbeans.modules.java.hints.providers.spi.Trigger; -import org.netbeans.modules.java.hints.spiimpl.JavaFixImpl; -import org.netbeans.modules.java.hints.spiimpl.MessageImpl; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.BatchResult; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchUtilities; -import org.netbeans.modules.java.hints.spiimpl.batch.ProgressHandleWrapper; -import org.netbeans.modules.java.hints.spiimpl.batch.Scopes; -import org.netbeans.modules.java.hints.spiimpl.hints.HintsInvoker; -import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings; -import org.netbeans.modules.java.hints.spiimpl.pm.PatternCompiler; -import org.netbeans.modules.refactoring.spi.RefactoringElementImplementation; -import org.netbeans.spi.editor.hints.*; -import org.netbeans.spi.java.hints.HintContext; -import org.netbeans.spi.java.hints.JavaFix; -import org.openide.util.Exceptions; - -/** - * Static utility classes for processing jackpot patterns. - * Rules Language - * @author Jan Becicka - * @since 1.1 - */ -public final class TransformationSupport { - - private String jackpotPattern; - private Transformer transformer; - private AtomicBoolean cancel = new AtomicBoolean(); - - private TransformationSupport(String jackpotPattern, Transformer transformer) { - this.jackpotPattern = jackpotPattern; - this.transformer = transformer; - } - - /** - * Creates new TransformationSupport representing given jackpotPattern. - * @param jackpotPattern - * @return - */ - public static @NonNull TransformationSupport create(@NonNull String jackpotPattern) { - return new TransformationSupport(jackpotPattern, null); - } - - /** - * Creates new TransformationSupport representing given jackpotPattern with custom Transformer. - * @param inputJackpotPattern - * @param t - * @see Transformer - * @return - */ - public static @NonNull TransformationSupport create(@NonNull String inputJackpotPattern, @NonNull Transformer t) { - return new TransformationSupport(inputJackpotPattern, t); - } - - /** - * Option to cancel query. - * @param cancel - * @return - */ - public @NonNull TransformationSupport setCancel(@NonNull AtomicBoolean cancel) { - this.cancel = cancel; - return this; - } - - - /** - * Run current transformation on all projects and collect results. - * @return collection of {@link ModificationResult} - */ - public @NonNull Collection processAllProjects() { - if (transformer!=null) { - return performTransformation(jackpotPattern, transformer, cancel); - } else { - return performTransformation(jackpotPattern, cancel); - } - } - - - /** - * Process current transformation on given treePath and performs rewrite on - * workingCopy. - * @param workingCopy - * @param treePath - */ - public void transformTreePath(@NonNull WorkingCopy workingCopy, @NonNull TreePath treePath) { - if (transformer!=null) { - throw new UnsupportedOperationException("Not implemented yet"); - } else { - performTransformation(workingCopy, treePath, jackpotPattern, cancel); - } - } - - - /** - * Transformer callback which is called for each occurrence during processing - * of {@link #performTransformation(java.lang.String, org.netbeans.spi.java.hints.support.JackpotSupport.Transformer, java.util.concurrent.atomic.AtomicBoolean) - */ - public interface Transformer { - - /** - * Implement custom transformation of occurrence here. - * @param copy - * @param occurrence - */ - public void transform(WorkingCopy copy, Occurrence occurrence); - - } - - - - /** - * Performs transformation described by jackpotPattern on given workingCopy. - * @param workingCopy - * @param jackpotPattern - * @param cancel - */ - private static void performTransformation(WorkingCopy workingCopy, TreePath on, String jackpotPattern, AtomicBoolean cancel) { - Iterable hints = PatternConvertor.create(jackpotPattern); - HintsInvoker inv = new HintsInvoker(HintsSettings.getSettingsFor(workingCopy.getFileObject()), cancel); - Map> computeHints = inv.computeHints(workingCopy, on, false, hints, new ArrayList()); - - if (computeHints == null || cancel.get()) return ; - - List errs = new ArrayList(); - for (Entry> entry: computeHints.entrySet()) { - errs.addAll(entry.getValue()); - } - List problems = new LinkedList(); - - try { - if (BatchUtilities.applyFixes(workingCopy, Collections.>emptyMap(), errs, null, new ArrayList(), problems)) { - throw new IllegalStateException(); - } - } catch (IllegalStateException ex) { - Exceptions.printStackTrace(ex); - } catch (Exception ex) { - Exceptions.printStackTrace(ex); - } - - if (!problems.isEmpty()) { - throw new IllegalStateException(problems.get(0).text); - } - } - - /** - * Performs jackpotPattern transformation in all open projects. - * @param jackpotPattern - * @param cancel - * @return - */ - private static Collection performTransformation(String jackpotPattern, AtomicBoolean cancel) { - Collection problems = new LinkedList(); - BatchResult batchResult = BatchSearch.findOccurrences(PatternConvertor.create(jackpotPattern), Scopes.allOpenedProjectsScope()); - return BatchUtilities.applyFixes(batchResult, new ProgressHandleWrapper(1, 1), cancel, problems); - } - - /** - * Performs transformation defined by transformer on all occurrences, which matches inputJackpotPattern. - * @param inputJackpotPattern - * @param transformer - * @return collection of ModificationResults. - */ - private static Collection performTransformation(final String inputJackpotPattern, final Transformer transformer, AtomicBoolean cancel) { - List descriptions = new ArrayList(); - - for (HintDescription hd : PatternConvertor.create(inputJackpotPattern)) { - final String triggerPattern = ((Trigger.PatternDescription) hd.getTrigger()).getPattern(); - descriptions.add(HintDescriptionFactory.create().setTrigger(hd.getTrigger()).setWorker(new HintDescription.Worker() { - @Override public Collection createErrors(HintContext ctx) { - final Map> constraintsHandles = new HashMap>(); - - for (Map.Entry c : ctx.getConstraints().entrySet()) { - constraintsHandles.put(c.getKey(), TypeMirrorHandle.create(c.getValue())); - } - - Fix fix = new JavaFix(ctx.getInfo(), ctx.getPath()) { - @Override protected String getText() { - return ""; - } - @Override protected void performRewrite(JavaFix.TransformationContext ctx) { - WorkingCopy wc = ctx.getWorkingCopy(); - Map constraints = new HashMap(); - - for (Map.Entry> c : constraintsHandles.entrySet()) { - constraints.put(c.getKey(), c.getValue().resolve(wc)); - } - - Pattern pattern = PatternCompiler.compile(wc, triggerPattern, constraints, Collections.emptyList()); - Collection occurrence = Matcher.create(wc).setTreeTopSearch().setSearchRoot(ctx.getPath()).match(pattern); - - assert occurrence.size() == 1; - - transformer.transform(wc, occurrence.iterator().next()); - } - }.toEditorFix(); - - return Collections.singletonList(ErrorDescriptionFactory.createErrorDescription(Severity.WARNING, "", Collections.singletonList(fix), ctx.getInfo().getFileObject(), 0, 0)); - } - }).produce()); - - } - - BatchSearch.BatchResult batchResult = BatchSearch.findOccurrences(descriptions, Scopes.allOpenedProjectsScope()); - return BatchUtilities.applyFixes(batchResult, new ProgressHandleWrapper(1, 1), cancel, new ArrayList()); - } - - /** - * Performs transformation described by transformationJackpotPattern on all occurences described by inputJackpotPattern. - * @param inputJackpotPattern - * @param transformationJackpotPattern - * @param cancel - * @return - */ - private static Collection performTransformation(String inputJackpotPattern, final String transformationJackpotPattern, AtomicBoolean cancel) { - return performTransformation(inputJackpotPattern, new Transformer() { - - @Override - public void transform(WorkingCopy copy, Occurrence occurrence) { - try { - Fix toFix = TransformationSupport.rewriteFix(copy, "whatever", occurrence.getOccurrenceRoot(), transformationJackpotPattern, occurrence.getVariables(), occurrence.getMultiVariables(), occurrence.getVariables2Names(), Collections.emptyMap(), Collections.emptyMap()); - TransformationSupport.process(((JavaFixImpl) toFix).jf, copy, false, null, new ArrayList()); - } catch (Exception ex) { - Exceptions.printStackTrace(ex); - } - } - }, cancel); - } - - private static ChangeInfo process(JavaFix jf, WorkingCopy wc, boolean canShowUI, Map resourceContent, Collection fileChanges) throws Exception { - return JavaFixImpl.Accessor.INSTANCE.process(jf, wc, canShowUI, resourceContent, fileChanges); - } - - /** - * - * @param info - * @param displayName - * @param what - * @param to - * @param parameters - * @param parametersMulti - * @param parameterNames - * @param constraints - * @param options - * @param imports - * @return - */ - private static Fix rewriteFix(CompilationInfo info, String displayName, TreePath what, final String to, Map parameters, Map> parametersMulti, final Map parameterNames, Map constraints, Map options, String... imports) { - return JavaFixImpl.Accessor.INSTANCE.rewriteFix(info, displayName, what, to, parameters, parametersMulti, parameterNames, constraints, options, imports); - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/providers/code/CodeHintProviderImplTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/providers/code/CodeHintProviderImplTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,114 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.providers.code; - -import com.sun.source.tree.Tree.Kind; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import org.junit.Test; -import org.netbeans.spi.java.hints.ConstraintVariableType; -import org.netbeans.spi.java.hints.Hint; -import org.netbeans.spi.java.hints.TriggerPattern; -import org.netbeans.spi.java.hints.TriggerTreeKind; -import org.netbeans.spi.java.hints.HintContext; -import static org.junit.Assert.*; -import org.netbeans.modules.java.hints.providers.code.CodeHintProviderImpl.WorkerImpl; -import org.netbeans.modules.java.hints.spiimpl.SPIAccessor; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata; -import org.netbeans.spi.editor.hints.ErrorDescription; - -/** - * - * @author lahvac - */ -@Hint(displayName="foo", description="bar", id="hintPattern", category="general") -public class CodeHintProviderImplTest { - - public CodeHintProviderImplTest() { - } - - @Test - public void testComputeHints() throws Exception { - Map> hints = new CodeHintProviderImpl().computeHints(); - - Set golden = new HashSet(Arrays.asList( - "$1.toURL():public static org.netbeans.spi.editor.hints.ErrorDescription org.netbeans.modules.java.hints.providers.code.CodeHintProviderImplTest.hintPattern1(org.netbeans.spi.java.hints.HintContext)", - "[METHOD_INVOCATION]:public static org.netbeans.spi.editor.hints.ErrorDescription org.netbeans.modules.java.hints.providers.code.CodeHintProviderImplTest.hintPattern2(org.netbeans.spi.java.hints.HintContext)" - )); - - for (Collection hds : hints.values()) { - for (HintDescription d : hds) { - golden.remove(toString(d)); - } - } - - assertTrue(golden.toString(), golden.isEmpty()); - } - - private static String toString(HintDescription hd) throws Exception { - StringBuilder sb = new StringBuilder(); - - sb.append(hd.getTrigger()); - sb.append(":"); - - //TODO: constraints - sb.append(((WorkerImpl) hd.getWorker()).getMethod().toGenericString()); - - return sb.toString(); - } - - @TriggerPattern(value="$1.toURL()", constraints=@ConstraintVariableType(variable="$1", type="java.io.File")) - public static ErrorDescription hintPattern1(HintContext ctx) { - return null; - } - - @TriggerTreeKind(Kind.METHOD_INVOCATION) - public static ErrorDescription hintPattern2(HintContext ctx) { - return null; - } - -} \ No newline at end of file diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/providers/code/FSWrapperTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/providers/code/FSWrapperTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,221 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.providers.code; - -import java.lang.annotation.Annotation; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Array; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.prefs.Preferences; -import javax.sound.sampled.LineListener; -import javax.swing.JComponent; -import javax.swing.JPanel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import org.junit.Test; -import org.netbeans.modules.java.hints.providers.code.FSWrapper.AnnotatableWrapper; -import org.netbeans.modules.java.hints.providers.code.FSWrapper.ClassWrapper; -import org.netbeans.modules.java.hints.providers.code.FSWrapper.MethodWrapper; -import org.netbeans.spi.java.hints.CustomizerProvider; -import org.netbeans.spi.java.hints.Hint; -import org.netbeans.spi.java.hints.HintContext; -import org.netbeans.spi.java.hints.TestAnnotations.TestAnnotation1; -import org.netbeans.spi.java.hints.TestAnnotations.TestAnnotation2; -import org.netbeans.spi.java.hints.TestAnnotations.TestAnnotation3; -import org.netbeans.spi.java.hints.TestAnnotations.TestEnum; - -/** - * - * @author lahvac - */ -public class FSWrapperTest { - - public FSWrapperTest() { - } - - @Test - public void testWrappedClasses() throws Exception { - Class[] classes = new Class[] {TestClass.class}; - Iterable wrapped = FSWrapper.listClasses(); - - OUTER: for (Class c : classes) { - for (ClassWrapper w : wrapped) { - if (w.getName().equals(c.getName())) { - checkClassWrapper(c, w); - continue OUTER; - } - } - - fail(c.getName()); - } - } - - private static void checkClassWrapper(Class c, ClassWrapper cw) throws Exception { - checkAnnotations(c, cw); - - OUTER: for (Method m : c.getDeclaredMethods()) { - if (m.getAnnotations().length == 0) continue; - - for (MethodWrapper wrapped : cw.getMethods()) { - if (wrapped.getName().equals(m.getName())) { - assertEquals(m, FSWrapper.resolveMethod(wrapped.getClazz().getName(), wrapped.getName())); - checkAnnotations(m, wrapped); - continue OUTER; - } - } - - fail(m.getName()); - } - } - - private static void checkAnnotations(AnnotatedElement el, AnnotatableWrapper aw) throws Exception { - for (Annotation ann : el.getAnnotations()) { - Annotation wrapper = aw.getAnnotation(ann.annotationType()); - - assertNotNull(ann.annotationType().getName(), wrapper); - - checkAnnotation(ann, wrapper); - } - } - - private static void checkAnnotation(Annotation real, Annotation wrapped) throws Exception { - for (Method m : real.annotationType().getDeclaredMethods()) { - Object realValue = m.invoke(real); - Object wrappedValue = m.invoke(wrapped); - - checkValue(realValue, wrappedValue); - } - } - - private static void checkValue(Object o1, Object o2) throws Exception { - assertEquals(o1.getClass().isAnnotation(), o2.getClass().isAnnotation()); - if (o1.getClass().isAnnotation()) { - assertEquals(((Annotation) o1).annotationType(), ((Annotation) o2).annotationType()); - } else { - assertEquals(o1.getClass(), o2.getClass()); - } - - if (o1.getClass().isArray()) { - assertEquals(Array.getLength(o1), Array.getLength(o2)); - - for (int c = 0; c < Array.getLength(o1); c++) { - checkValue(Array.get(o1, c), Array.get(o2, c)); - } - } else if (o1.getClass().isAnnotation()) { - checkAnnotation((Annotation) o1, (Annotation) o2); - } else { - assertEquals(o1, o2); - } - } - - @Hint(displayName="foo", description="bar", category="") - @TestAnnotation1( - b1=true, - b3=true, - i1=42, - i3=84, - s1="a42", - s3="a84", - a1=@TestAnnotation2(a1=@TestAnnotation3(as1={"u1a2", "u1b2"}, as3="u1c2")), -// a3=@TestAnnotation2(a1=@TestAnnotation3(as1={"u1a2", "u1b2"}, as3="u1c2")), - c1=String.class, - c3=String.class, - e1=TestEnum.C, - e3=TestEnum.D, - ab1={false, true}, - ab3={false, true, false}, - ai1={84, 42}, - ai3={84, 42, 84}, - as1={"c42", "c84"}, - as3={"c42", "c84", "c42"}, - aa1={@TestAnnotation2(a1=@TestAnnotation3(as1={"u3a2", "u3b2"}, as3="u3c2")), @TestAnnotation2(a1=@TestAnnotation3(as1={"u4a2", "u4b2"}, as3="u4c2"))}, -// aa3={@TestAnnotation2(a1=@TestAnnotation3(as1={"u5a2", "u5b2"}, as3="u5c2")), @TestAnnotation2(a1=@TestAnnotation3(as1={"u6a2", "u6b2"}, as3="u6c2"))}, - ac1={List.class, Integer.class}, - ac3={LineListener.class, LinkedList.class}, - ae1={TestEnum.C, TestEnum.D}, - ae3={TestEnum.D, TestEnum.C} - ) - public static class TestClass { - @TestAnnotation1( - b1=false, - b2=true, - i1=43, - i2=85, - s1="w42", - s2="w84", - a1=@TestAnnotation2(a1=@TestAnnotation3(as1={"u7a2", "u7b2"}, as3="u7c2")), -// a2=@TestAnnotation2(a1=@TestAnnotation3(as1={"u8a2", "u8b2"}, as3="u8c2")), - c1=String.class, - c2=String.class, - e1=TestEnum.C, - e3=TestEnum.D, - ab1={false, true}, - ab2={false, true, false}, - ai1={85, 43}, - ai2={85, 43, 85}, - as1={"d42", "d84"}, - as2={"e42", "e84", "e42"}, - aa1={@TestAnnotation2(a1=@TestAnnotation3(as1={"u9a2", "u9b2"}, as3="u9c2")), @TestAnnotation2(a1=@TestAnnotation3(as1={"uaa2", "u4b2"}, as3="uac2"))}, -// aa2={@TestAnnotation2(a1=@TestAnnotation3(as1={"uba2", "ubb2"}, as3="ubc2")), @TestAnnotation2(a1=@TestAnnotation3(as1={"uca2", "ucb2"}, as3="ucc2"))}, - ac1={ArrayList.class, Float.class}, - ac2={StringBuilder.class, Map.class}, - ae1={TestEnum.C, TestEnum.D}, - ae3={TestEnum.D, TestEnum.C} - ) - public static void test(HintContext ctx) { - - } - } - - public static class CustomizerImpl implements CustomizerProvider { - @Override public JComponent getCustomizer(Preferences prefs) { - return new JPanel(); - } - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/providers/code/TestAnnotations.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/providers/code/TestAnnotations.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,109 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2012 Sun Microsystems, Inc. - */ -//placed in this package intentionally: the JavaHintsAnnotationProcessor ignores all annotations outside this package -package org.netbeans.spi.java.hints; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -/** - * - * @author lahvac - */ -public class TestAnnotations { - - @Retention(RetentionPolicy.RUNTIME) - public @interface TestAnnotation1 { - public boolean b1(); - public boolean b2() default false; - public boolean b3() default false; - public int i1(); - public int i2() default 1; - public int i3() default 1; - public String s1(); - public String s2() default ""; - public String s3() default ""; - public TestAnnotation2 a1(); -// public TestAnnotation2 a2() default @TestAnnotation2(a1=@TestAnnotation3(as1={"a", "b"}, as3="c")); -// public TestAnnotation2 a3() default @TestAnnotation2(a1=@TestAnnotation3(as1={"a2", "b2"}, as3="c2")); - public Class c1(); - public Class c2() default Void.class; - public Class c3() default Void.class; - public TestEnum e1(); -// public TestEnum e2() default TestEnum.A; - public TestEnum e3()/* default TestEnum.A*/; - public boolean[] ab1(); - public boolean[] ab2() default false; - public boolean[] ab3() default false; - public int[] ai1(); - public int[] ai2() default 1; - public int[] ai3() default 1; - public String[] as1(); - public String[] as2() default ""; - public String[] as3() default ""; - public TestAnnotation2[] aa1(); -// public TestAnnotation2[] aa2() default @TestAnnotation2(a1=@TestAnnotation3(as1={"a", "b"}, as3="c")); -// public TestAnnotation2[] aa3() default @TestAnnotation2(a1=@TestAnnotation3(as1={"a2", "b2"}, as3="c2")); - public Class[] ac1(); - public Class[] ac2() default Void.class; - public Class[] ac3() default Void.class; - public TestEnum[] ae1(); -// public TestEnum[] ae2() default TestEnum.A; - public TestEnum[] ae3()/* default TestEnum.A*/; - } - - public @interface TestAnnotation2 { - public TestAnnotation3 a1(); -// public TestAnnotation3 a2() default @TestAnnotation3(as1={"d", "e"}, as3="f"); -// public TestAnnotation3 a3() default @TestAnnotation3(as1={"g", "h"}, as3="i"); - } - - public @interface TestAnnotation3 { - public String[] as1(); - public String[] as2() default {""}; - public String[] as3() default {""}; - } - - public enum TestEnum { - A, B, C, D; - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/TestBase.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/TestBase.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,124 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl; - -import java.io.File; -import javax.swing.text.Document; -import org.netbeans.api.java.lexer.JavaTokenId; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.JavaSource.Phase; -import org.netbeans.api.java.source.SourceUtilsTestUtil; -import org.netbeans.api.java.source.TestUtilities; -import org.netbeans.api.lexer.Language; -import org.netbeans.junit.NbTestCase; -import org.netbeans.modules.java.source.TreeLoader; -import org.openide.cookies.EditorCookie; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; -import org.openide.loaders.DataObject; - -/** - * - * @author Jan Lahoda - */ -public class TestBase extends NbTestCase { - - public TestBase(String name) { - super(name); - } - - @Override - protected void setUp() throws Exception { - super.setUp(); - SourceUtilsTestUtil.prepareTest(new String[0], new Object[0]); - TreeLoader.DISABLE_CONFINEMENT_TEST = true; - clearWorkDir(); - - FileUtil.refreshFor(File.listRoots()); - } - - private int workDirPart = 0; - - protected void prepareTest(String fileName, String code) throws Exception { - FileObject workFO = FileUtil.createFolder(new File(getWorkDir(), String.valueOf(workDirPart++))); - - assertNotNull(workFO); - - workFO.refresh(); - - sourceRoot = workFO.createFolder("src"); - FileObject buildRoot = workFO.createFolder("build"); - FileObject cache = workFO.createFolder("cache"); - - FileObject data = FileUtil.createData(sourceRoot, fileName); - File dataFile = FileUtil.toFile(data); - - assertNotNull(dataFile); - - TestUtilities.copyStringToFile(dataFile, code); - - SourceUtilsTestUtil.prepareTest(sourceRoot, buildRoot, cache); - - DataObject od = DataObject.find(data); - EditorCookie ec = od.getLookup().lookup(EditorCookie.class); - - assertNotNull(ec); - - doc = ec.openDocument(); - doc.putProperty(Language.class, JavaTokenId.language()); - - JavaSource js = JavaSource.forFileObject(data); - - assertNotNull(js); - - info = SourceUtilsTestUtil.getCompilationInfo(js, Phase.RESOLVED); - - assertNotNull(info); - } - - protected FileObject sourceRoot; - protected CompilationInfo info; - protected Document doc; - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/TestCompilerSettings.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/TestCompilerSettings.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl; - -import org.netbeans.modules.java.source.tasklist.CompilerSettings; -import org.openide.filesystems.FileObject; -import org.openide.util.lookup.ServiceProvider; - -/** - * - * @author lahvac - */ -@ServiceProvider(service=CompilerSettings.class, position=0, supersedes="org.netbeans.modules.java.hints.StandardJavacWarnings$CompilerSettingsImpl") -public class TestCompilerSettings extends CompilerSettings { - public static String commandLine; - @Override - protected String buildCommandLine(FileObject file) { - return commandLine; - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/TestUtilities.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/TestUtilities.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): - * - * Portions Copyrighted 2007 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl; - -import junit.framework.Assert; - -/** - * - * @author Jan Lahoda - */ -public class TestUtilities { - - private TestUtilities() { - } - - public static String detectOffsets(String source, int[] positionOrSpan) { - return detectOffsets(source, positionOrSpan, "\\|"); - } - - public static String detectOffsets(String source, int[] positionOrSpan, String delimiter) { - //for now, the position/span delimiter is '|', without possibility of escaping: - String[] split = source.split(delimiter); - - Assert.assertTrue("incorrect number of position markers (|)", positionOrSpan.length == split.length - 1); - - StringBuilder sb = new StringBuilder(); - int index = 0; - int offset = 0; - - for (String s : split) { - sb.append(s); - if (index < positionOrSpan.length) - positionOrSpan[index++] = (offset += s.length()); - } - - return sb.toString(); - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/UtilitiesTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/UtilitiesTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,644 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl; - -import com.sun.source.tree.IfTree; -import com.sun.source.tree.LambdaExpressionTree; -import com.sun.source.tree.MemberSelectTree; -import com.sun.source.tree.ModifiersTree; -import com.sun.source.tree.Scope; -import com.sun.source.tree.Tree; -import com.sun.source.tree.Tree.Kind; -import com.sun.source.tree.VariableTree; -import com.sun.source.util.SourcePositions; -import com.sun.source.util.TreePath; -import com.sun.source.util.TreeScanner; -import com.sun.tools.javac.tree.JCTree; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.type.TypeMirror; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.source.ClasspathInfo; -import org.netbeans.api.java.source.CompilationController; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.JavaSource.Phase; -import org.netbeans.api.java.source.Task; -import org.netbeans.junit.RandomlyFails; -import org.netbeans.modules.java.source.pretty.VeryPretty; -import org.netbeans.modules.java.source.save.DiffContext; - -/** - * - * @author lahvac - */ -public class UtilitiesTest extends TestBase { - - public UtilitiesTest(String name) { - super(name); - } - - public void testParseAndAttributeExpressionStatement() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.singletonMap("$1", info.getTreeUtilities().parseType("int", info.getTopLevelElements().get(0)))); - Tree result = Utilities.parseAndAttribute(info, "$1 = 1;", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.EXPRESSION_STATEMENT); - } - - public void testParseAndAttributeVariable() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.singletonMap("$1", info.getTreeUtilities().parseType("int", info.getTopLevelElements().get(0)))); - Tree result = Utilities.parseAndAttribute(info, "int $2 = $1;", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.VARIABLE); - } - - public void testParseAndAttributeMultipleStatements() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "String $2 = $1; int $l = $2.length(); System.err.println($l);", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.BLOCK); - - String golden = "{\n" + - " $$1$;\n" + - " String $2 = $1;\n" + - " int $l = $2.length();\n" + - " System.err.println($l);\n" + - " $$2$;\n" + - "}"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testParseAndAttributeMethod() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.singletonMap("$1", info.getTreeUtilities().parseType("int", info.getTopLevelElements().get(0)))); - String methodCode = "private int test(int i) { return i; }"; - Tree result = Utilities.parseAndAttribute(info, methodCode, s); - - assertEquals(Kind.METHOD, result.getKind()); - assertEquals(methodCode.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ").trim()); - } - - public void testParseAndAttributeMultipleClassMembers() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.singletonMap("$1", info.getTreeUtilities().parseType("int", info.getTopLevelElements().get(0)))); - String code = "private int i; private int getI() { return i; } private void setI(int i) { this.i = i; }"; - Tree result = Utilities.parseAndAttribute(info, code, s); - - String golden = "class $ {\n" + - " $$1$;\n" + - " private int i;\n" + - " private int getI() {\n" + - " return i;\n" + - " }\n" + - " private void setI(int i) {\n" + - " this.i = i;\n" + - " }\n" + - "}"; - - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ").trim()); - } - - public void testParseAndAttributeFieldModifiersVariable() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - String code = "$mods$ java.lang.String $name;"; - Tree result = Utilities.parseAndAttribute(info, code, s); - - String golden = "$mods$ java.lang.String $name"; - - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ").trim()); - } - - public void testParseAndAttributeIfWithParenthetised() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - String code = "if ($c) { $1$; System.err.println('a'); $2$; }"; - Tree result = Utilities.parseAndAttribute(info, code, s); - - IfTree it = (IfTree) result; - - assertEquals(Kind.PARENTHESIZED, it.getCondition().getKind()); - - String golden = "if ($c) { $1$; System.err.println('a'); $2$; }"; - - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ").trim()); - } - - public void testParseAndAttributeMultipleStatements2() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "$type $name = $map.get($key); if ($name == null) { $map.put($key, $name = $init); }", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.BLOCK); - - String golden = "{" + - " $$1$;" + - " $type $name = $map.get($key);" + - " if ($name == null) {" + - " $map.put($key, $name = $init);" + - " }" + - " $$2$;\n" + - "}"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testParseAndAttributeMethodDeclarationWithMultiparameters() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "public void t($params$) {}", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.METHOD); - - String golden = " public void t($params$) { }"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testParseAndAttributeMethodModifiersVariable() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - String code = "$mods$ $type $name() { $r$; }"; - Tree result = Utilities.parseAndAttribute(info, code, s); - - String golden = "$mods$ $type $name() { $r$; }"; - - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ").trim()); - } - - public void testSimpleExpression() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "$1.isDirectory()", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.METHOD_INVOCATION); - - String golden = "$1.isDirectory()"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testARMResourceVariable1() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "try ($t$) { $stmts$; } catch $catches$", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.TRY); - - String golden = "try ($t$) { $stmts$; }$catches$"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testARMResourceVariable2() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "try ($t$; $type $name = $init) { $stmts$; } catch $catches$", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.TRY); - - String golden = "try ($t$ final $type $name = $init;) { $stmts$; }$catches$"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testARMResourceNotVariable() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "try ($t $n = $init$) { $stmts$; } catch $catches$", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.TRY); - - String golden = "try (final $t $n = $init$;) { $stmts$; }$catches$"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testParseAndAttributeType() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "\njava. util \n.List \n", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.MEMBER_SELECT); - - assertEquals(ElementKind.INTERFACE, info.getTrees().getElement(new TreePath(new TreePath(info.getCompilationUnit()), result)).getKind()); - assertEquals(info.getElements().getTypeElement("java.util.List"), info.getTrees().getElement(new TreePath(new TreePath(info.getCompilationUnit()), result))); - } - - public void testCatchMultiparam() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "try {\n }\n catch $catch$ finally {\n }\n", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.TRY); - - String golden = "try {\n }$catch$ finally {\n }"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testCaseMultiparam() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "switch ($v) {case $c1$ case 1: ; case $c2$; case 3: ;}", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.SWITCH); - - String golden = "switch ($v) { $c1$ case 1: ; $c2$ case 3: ; }"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testOrdinaryCatch() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "try {\n }\n catch (NullPointerException ex) { } finally {\n }\n", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.TRY); - - String golden = "try {\n } catch (NullPointerException ex) { } finally {\n }"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testClassPattern() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "$mods$ class $name extends java.util.LinkedList { $methods$; }\n", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.CLASS); - - String golden = " $mods$ class $name extends java.util.LinkedList { $name() { super(); } $methods$ }"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testErrorsForPatterns1() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - SourcePositions[] positions = new SourcePositions[1]; - Collection> errors = new LinkedList>(); - String code = "foo bar"; - Tree result = Utilities.parseAndAttribute(info, code, null, positions, errors); - - assertDiagnostics(errors, "7-7:compiler.err.expected"); - assertPositions(result, positions[0], code, "foo", "foo bar"); - } - - @RandomlyFails - public void testErrorsForPatterns2() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - SourcePositions[] positions = new SourcePositions[1]; - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Collection> errors = new LinkedList>(); - String code = "$1.isDirectory()"; - Tree result = Utilities.parseAndAttribute(info, code, s, positions, errors); - - assertDiagnostics(errors, "0-0:compiler.err.cant.resolve.location"); - assertPositions(result, positions[0], code, "$1", "$1.isDirectory", "$1.isDirectory()"); - } - - public void testErrorsForPatterns3() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - SourcePositions[] positions = new SourcePositions[1]; - Collection> errors = new LinkedList>(); - String code = "if ($cond) { foo() } else $else;"; - Tree result = Utilities.parseAndAttribute(info, code, null, positions, errors); - - assertDiagnostics(errors, "18-18:compiler.err.expected"); - assertPositions(result, positions[0], code, "$cond", "$else", "$else;", "($cond)", "foo", "foo()", "foo() ", "if ($cond) { foo() } else $else;", "{ foo() }"); - } - - public void testPositionsForCorrectStatement() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - SourcePositions[] positions = new SourcePositions[1]; - Collection> errors = new LinkedList>(); - String code = "assert true;"; - Tree result = Utilities.parseAndAttribute(info, code, null, positions, errors); - - assertTrue(errors.isEmpty()); - assertPositions(result, positions[0], code, "assert true;", "true"); - } - - public void testCasePattern() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - SourcePositions[] positions = new SourcePositions[1]; - Collection> errors = new LinkedList>(); - String code = "case $expr: foo bar $stmts$;\n"; - Tree result = Utilities.parseAndAttribute(info, code, null, positions, errors); - - assertTrue(result.getKind().name(), result.getKind() == Kind.CASE); - - String golden = "case $expr: foo bar; $stmts$; "; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - assertDiagnostics(errors, "19-19:compiler.err.expected"); - assertPositions(result, positions[0], code, "$expr", "$stmts$", "$stmts$;", "case $expr: foo bar $stmts$;", "foo", "foo bar "); - } - - public void testLambdaPattern() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "new $type() {\n $mods$ $resultType $methodName($args$) {\n $statements$;\n }\n }\n", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.NEW_CLASS); - - String golden = "new $type(){ $mods$ $resultType $methodName($args$) { $statements$; } }"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - - Collection> errors = new LinkedList>(); - - result = Utilities.parseAndAttribute(info, "new $type() {\n $mods$ $resultType $methodName($args$) {\n $statements$;\n }\n }\n", null, errors); - assertTrue(result.getKind().name(), result.getKind() == Kind.NEW_CLASS); - - golden = "new $type(){ $mods$ $resultType $methodName($args$) { $statements$; } }"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - assertTrue(errors.toString(), errors.isEmpty()); - } - - public void testPackagePattern() throws Exception { - prepareTest("test/a/Test.java", "package test.a; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "test.$1", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.MEMBER_SELECT); - - String golden = "test.$1"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - - Element total = info.getTrees().getElement(new TreePath(new TreePath(info.getCompilationUnit()), result)); - - assertTrue(Utilities.isError(total)); - - Element testPack = info.getTrees().getElement(new TreePath(new TreePath(info.getCompilationUnit()), ((MemberSelectTree) result).getExpression())); - - assertFalse(Utilities.isError(testPack)); - assertEquals(info.getElements().getPackageElement("test"), testPack); - } - - public void DtestMultiStatementVarWithModifiers() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "$mods$ $type $name; $name = $init;", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.BLOCK); - - String golden = "{ $$1$; $mods$$type $name; $name = $init; $$2$; }"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testAnnotation() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "@$annotation($args$)", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.ANNOTATION); - - String golden = "@$annotation(value = $args$)"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testParseAndAttributeMultipleStatementsWithBefore() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "$before$; String $2 = $1; int $l = $2.length(); System.err.println($l);", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.BLOCK); - - String golden = "{\n" + - " $before$;\n" + - " String $2 = $1;\n" + - " int $l = $2.length();\n" + - " System.err.println($l);\n" + - " $$2$;\n" + - "}"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testParseAndAttributeMultipleStatementsWithAfter() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "String $2 = $1; int $l = $2.length(); System.err.println($l); $after$;", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.BLOCK); - - String golden = "{\n" + - " $$1$;\n" + - " String $2 = $1;\n" + - " int $l = $2.length();\n" + - " System.err.println($l);\n" + - " $after$;\n" + - "}"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testMethodFormalParams() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "$mods$ $ret $name($pref$, $type $name, $suff$) throws $throws$ { $body$; }", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.METHOD); - - String golden = " $mods$ $ret $name($pref$, $type $name, $suff$) throws $throws$ { $body$; }"; - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ")); - } - - public void testPartialModifiers() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "$mods$ @Deprecated public $type $name;", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.VARIABLE); - - ModifiersTree mods = ((VariableTree) result).getModifiers(); - String golden = "$mods$,@Deprecated(), [public]"; - - assertEquals(golden.replaceAll("[ \n\r]+", " "), mods.getAnnotations().toString() + ", " + mods.getFlags().toString()); - } - - public void testBrokenPlatform226678() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - JavaSource.create(ClasspathInfo.create(ClassPath.EMPTY, ClassPath.EMPTY, ClassPath.EMPTY), info.getFileObject()).runUserActionTask(new Task() { - @Override public void run(CompilationController parameter) throws Exception { - parameter.toPhase(Phase.RESOLVED); - info = parameter; - } - }, true); - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - String methodCode = "private int test(int i) { return i; }"; - Tree result = Utilities.parseAndAttribute(info, methodCode, s); - - assertEquals(Kind.METHOD, result.getKind()); - assertEquals(methodCode.replaceAll("[ \n\r]+", " "), result.toString().replaceAll("[ \n\r]+", " ").trim()); - } - - public void testLambdaExpression1() throws Exception { - prepareTest("test/Test.java", "package test; public class Test{}"); - - Scope s = Utilities.constructScope(info, Collections.emptyMap()); - Tree result = Utilities.parseAndAttribute(info, "($args$) -> $expression", s); - - assertTrue(result.getKind().name(), result.getKind() == Kind.LAMBDA_EXPRESSION); - - LambdaExpressionTree let = (LambdaExpressionTree) result; - - assertEquals(Kind.IDENTIFIER, let.getParameters().get(0).getKind()); - String golden = "($args$)->$expression"; - - assertEquals(golden.replaceAll("[ \n\r]+", " "), result.toString()); - } - - public void testToHumanReadableTime() { - long time = 202; - assertEquals( "5s", Utilities.toHumanReadableTime(time += 5 * 1000)); - assertEquals( "3m5s", Utilities.toHumanReadableTime(time += 3 * 60 * 1000)); - assertEquals("7h3m5s", Utilities.toHumanReadableTime(time += 7 * 60 * 60 * 1000)); - } - - public void testGeneralization() throws Exception { - performGeneralizationTest("package test;\n" + - "public class Test {\n" + - " class Inner {\n" + - " Inner(int i) {}\n" + - " }\n" + - " public static void main(String[] args) {\n" + - " int i = 1;\n" + - " Test c = null;\n" + - " c.new Inner(i++) {};\n" + - " }\n" + - "}\n", - "package test;\n" + - "public class Test {\n" + - " class Inner {\n" + - " Inner(int $0) { super(); }\n" + - " }\n" + - " public static void main(String[] $1) {\n" + - " int $2 = 1;\n" + - " Test $3 = null;\n" + - " $4;\n" + //XXX - " }\n" + - "}\n"); - } - private void performGeneralizationTest(String code, String generalized) throws Exception { - prepareTest("test/Test.java", code); - - Tree generalizedTree = Utilities.generalizePattern(info, new TreePath(info.getCompilationUnit())); - VeryPretty vp = new VeryPretty(new DiffContext(info)); - - vp.print((JCTree) generalizedTree); - - String repr = vp.toString(); - - assertEquals(generalized.replaceAll("[ \n\t]+", " "), - repr.replaceAll("[ \n\t]+", " ")); - } - - private void assertDiagnostics(Collection> errors, String... golden) { - List actual = new ArrayList(errors.size()); - - for (Diagnostic d : errors) { - actual.add(d.getStartPosition() + "-" + d.getEndPosition() + ":" + d.getCode()); - } - - assertEquals(Arrays.asList(golden), actual); - } - - private void assertPositions(Tree t, final SourcePositions sp, final String code, String... golden) { - final List actual = new ArrayList(golden.length); - - new TreeScanner() { - @Override - public Void scan(Tree node, Void p) { - if (node != null) { - int start = (int) sp.getStartPosition(null, node); - int end = (int) sp.getEndPosition(null, node); - - if (start >= 0 && end >= 0) { - actual.add(code.substring(start, end)); - } - } - return super.scan(node, p); - } - }.scan(t, null); - - Collections.sort(actual); - - List goldenList = new ArrayList(Arrays.asList(golden)); - - Collections.sort(goldenList); - - assertEquals(goldenList, actual); - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearchTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearchTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,458 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2011 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl.batch; - -import org.netbeans.modules.java.hints.spiimpl.batch.TestUtils.File; -import org.netbeans.modules.java.hints.spiimpl.MessageImpl; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.regex.Pattern; -import junit.framework.TestSuite; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.classpath.GlobalPathRegistry; -import org.netbeans.api.java.classpath.GlobalPathRegistryEvent; -import org.netbeans.api.java.classpath.GlobalPathRegistryListener; -import org.netbeans.api.java.source.CompilationController; -import org.netbeans.api.java.source.SourceUtilsTestUtil; -import org.netbeans.core.startup.Main; -import org.netbeans.junit.NbTestCase; -import org.netbeans.junit.NbTestSuite; -import org.netbeans.junit.RandomlyFails; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.BatchResult; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Folder; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Resource; -import org.netbeans.modules.parsing.impl.indexing.CacheFolder; -import org.netbeans.modules.parsing.impl.indexing.MimeTypes; -import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.java.classpath.ClassPathProvider; -import org.netbeans.spi.java.classpath.support.ClassPathSupport; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileStateInvalidException; -import org.openide.filesystems.FileUtil; - -import org.openide.util.Exceptions; -import org.openide.util.lookup.ServiceProvider; -import static org.netbeans.modules.java.hints.spiimpl.batch.TestUtils.writeFilesAndWaitForScan; -import static org.netbeans.modules.java.hints.spiimpl.batch.TestUtils.prepareHints; - -/** - * - * @author lahvac - */ -public class BatchSearchTest extends NbTestCase { - - public BatchSearchTest(String name) { - super(name); - } - - public static TestSuite suite() { - TestSuite result = new NbTestSuite(); - - result.addTestSuite(BatchSearchTest.class); -// result.addTest(new BatchSearchTest("testBatchSearchFolderRemoteIndex")); - - return result; - } - - //XXX: copied from CustomIndexerImplTest: - @Override - protected void setUp() throws Exception { - SourceUtilsTestUtil.prepareTest(new String[0], new Object[0]); - Main.initializeURLFactory(); - org.netbeans.api.project.ui.OpenProjects.getDefault().getOpenProjects(); - prepareTest(); - MimeTypes.setAllMimeTypes(Collections.singleton("text/x-java")); - sourceCP = ClassPathSupport.createClassPath(src1, src2); - GlobalPathRegistry.getDefault().register(ClassPath.SOURCE, new ClassPath[] {sourceCP}); - RepositoryUpdater.getDefault().start(true); - super.setUp(); - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - GlobalPathRegistry.getDefault().unregister(ClassPath.SOURCE, new ClassPath[] {sourceCP}); - } - - public void testBatchSearch1() throws Exception { - writeFilesAndWaitForScan(src1, - new File("test/Test1.java", "package test; public class Test1 { private void test() { java.io.File f = null; f.isDirectory(); } }"), - new File("test/Test2.java", "package test; public class Test2 { private void test() { new javax.swing.ImageIcon(null); } }")); - writeFilesAndWaitForScan(src2, - new File("test/Test1.java", "package test; public class Test1 { private void test() { java.io.File f = null; f.isDirectory(); } }"), - new File("test/Test2.java", "package test; public class Test2 { private void test() { new javax.swing.ImageIcon(null); } }")); - - Iterable hints = prepareHints("$1.isDirectory()"); - BatchResult result = BatchSearch.findOccurrences(hints, Scopes.allOpenedProjectsScope()); - Map> output = new HashMap>(); - - for (Entry> e : result.getResourcesWithRoots().entrySet()) { - Collection resourcesRepr = new LinkedList(); - - for (Resource r : e.getValue()) { - resourcesRepr.add(r.getRelativePath()); - } - - output.put(e.getKey().getURL().toExternalForm(), resourcesRepr); - } - - Map> golden = new HashMap>(); - - golden.put(src1.getURL().toExternalForm(), Arrays.asList("test/Test1.java")); - golden.put(src2.getURL().toExternalForm(), Arrays.asList("test/Test1.java")); - - assertEquals(golden, output); - } - - public void testBatchSearchSpan() throws Exception { - String code = "package test;\n" + - "public class Test {\n" + - " private void m() {\n" + - " a(c.i().getFileObject());\n" + - " if (span != null && span[0] != (-1) && span[1] != (-1));\n" + - " c.i().getFileObject(\"\");\n" + - " }\n" + - "}\n"; - - writeFilesAndWaitForScan(src1, new File("test/Test.java", code)); - - Iterable hints = prepareHints("$0.getFileObject($1)"); - BatchResult result = BatchSearch.findOccurrences(hints, Scopes.allOpenedProjectsScope()); - - assertEquals(1, result.getResources().size()); - Iterator resources = result.getResources().iterator().next().iterator(); - Resource r = resources.next(); - - assertFalse(resources.hasNext()); - - Set snipets = new HashSet(); - - for (int[] span : r.getCandidateSpans()) { - snipets.add(code.substring(span[0], span[1])); - } - - Set golden = new HashSet(Arrays.asList("c.i().getFileObject(\"\")")); - assertEquals(golden, snipets); - } - - @RandomlyFails - public void testBatchSearchNotIndexed() throws Exception { - writeFilesAndWaitForScan(src1, - new File("test/Test1.java", "package test; public class Test1 { private void test() { java.io.File f = null; f.isDirectory(); } }"), - new File("test/Test2.java", "package test; public class Test2 { private void test() { new javax.swing.ImageIcon(null); } }")); - writeFilesAndWaitForScan(src3, - new File("test/Test1.java", "package test; public class Test1 { private void test() { Test2 f = null; f.isDirectory(); } }"), - new File("test/Test2.java", "package test; public class Test2 { public boolean isDirectory() {return false} }")); - - Iterable hints = prepareHints("$1.isDirectory()", "$1", "test.Test2"); - BatchResult result = BatchSearch.findOccurrences(hints, Scopes.specifiedFoldersScope(Folder.convert(src1, src3, empty))); - Map> output = new HashMap>(); - - for (Entry> e : result.getResourcesWithRoots().entrySet()) { - Collection resourcesRepr = new LinkedList(); - - for (Resource r : e.getValue()) { - resourcesRepr.add(r.getRelativePath()); - } - - output.put(e.getKey().getURL().toExternalForm(), resourcesRepr); - } - - Map> golden = new HashMap>(); - - golden.put(src1.getURL().toExternalForm(), Arrays.asList("test/Test1.java")); - golden.put(src3.getURL().toExternalForm(), Arrays.asList("test/Test1.java")); - - assertEquals(golden, output); - - //check verification: - Map>> verifiedOutput = verifiedSpans(result, false); - Map>> verifiedGolden = new HashMap>>(); - - verifiedGolden.put(src1.getURL().toExternalForm(), Collections.>singletonMap("test/Test1.java", Arrays.asList())); - verifiedGolden.put(src3.getURL().toExternalForm(), Collections.>singletonMap("test/Test1.java", Arrays.asList("0:75-0:86:verifier:"))); - - assertEquals(verifiedGolden, verifiedOutput); - } - - public void testBatchSearchForceIndexingOfProperDirectory() throws Exception { - FileObject data = FileUtil.createFolder(workdir, "data"); - FileObject dataSrc1 = FileUtil.createFolder(data, "src1"); - FileObject dataSrc2 = FileUtil.createFolder(data, "src2"); - writeFilesAndWaitForScan(dataSrc1, - new File("test/Test1.java", "package test; public class Test1 { private void test() { java.io.File f = null; f.isDirectory(); } }"), - new File("test/Test2.java", "package test; public class Test2 { private void test() { new javax.swing.ImageIcon(null); } }")); - writeFilesAndWaitForScan(dataSrc2, - new File("test/Test1.java", "package test; public class Test1 { private void test() { Test2 f = null; f.isDirectory(); } }"), - new File("test/Test2.java", "package test; public class Test2 { public boolean isDirectory() {return false} }")); - - ClassPathProviderImpl.setSourceRoots(Arrays.asList(dataSrc1, dataSrc2)); - - Iterable hints = prepareHints("$1.isDirectory()", "$1", "test.Test2"); - BatchResult result = BatchSearch.findOccurrences(hints, Scopes.specifiedFoldersScope(Folder.convert(data))); - Map> output = new HashMap>(); - - for (Entry> e : result.getResourcesWithRoots().entrySet()) { - Collection resourcesRepr = new HashSet(); - - for (Resource r : e.getValue()) { - resourcesRepr.add(r.getRelativePath()); - } - - output.put(e.getKey().getURL().toExternalForm(), resourcesRepr); - } - - Map> golden = new HashMap>(); - - golden.put(data.getURL().toExternalForm(), new HashSet(Arrays.asList("src1/test/Test1.java", "src2/test/Test1.java"))); - - assertEquals(golden, output); - - //check verification: - final Set added = new HashSet(); - final Set removed = new HashSet(); - - GlobalPathRegistry.getDefault().addGlobalPathRegistryListener(new GlobalPathRegistryListener() { - public void pathsAdded(GlobalPathRegistryEvent event) { - for (ClassPath cp : event.getChangedPaths()) { - added.addAll(Arrays.asList(cp.getRoots())); - } - } - public void pathsRemoved(GlobalPathRegistryEvent event) { - for (ClassPath cp : event.getChangedPaths()) { - removed.addAll(Arrays.asList(cp.getRoots())); - } - } - }); - -// verifiedGolden.put(data.getURL().toExternalForm(), Arrays.asList("0:75-0:86:verifier:TODO: No display name")); - Map>> verifiedOutput = verifiedSpans(result, false); - Map>> verifiedGolden = new HashMap>>(); - - Map> verifiedGoldenPart = new HashMap>(); - - verifiedGoldenPart.put("src1/test/Test1.java", Arrays.asList()); - verifiedGoldenPart.put("src2/test/Test1.java", Arrays.asList("0:75-0:86:verifier:")); - - verifiedGolden.put(data.getURL().toExternalForm(), verifiedGoldenPart); - - assertEquals(verifiedGolden, verifiedOutput); - assertEquals(new HashSet(Arrays.asList(dataSrc1, dataSrc2)), added); - assertEquals(new HashSet(Arrays.asList(dataSrc1, dataSrc2)), removed); - } - - public void testBatchSearchFolderNoIndex() throws Exception { - FileObject data = FileUtil.createFolder(workdir, "data"); - FileObject dataSrc1 = FileUtil.createFolder(data, "src1"); - FileObject dataSrc2 = FileUtil.createFolder(data, "src2"); - writeFilesAndWaitForScan(dataSrc1, - new File("test/Test1.java", "package test; public class Test1 { private void test() { java.io.File f = null; f.isDirectory(); } }"), - new File("test/Test2.java", "package test; public class Test2 { private void test() { new javax.swing.ImageIcon(null); } }")); - writeFilesAndWaitForScan(dataSrc2, - new File("test/Test1.java", "package test; public class Test1 { private void test() { Test2 f = null; f.isDirectory(); } }"), - new File("test/Test2.java", "package test; public class Test2 { public boolean isDirectory() {return false} }")); - - Iterable hints = prepareHints("$1.isDirectory()"); - BatchResult result = BatchSearch.findOccurrences(hints, Scopes.specifiedFoldersScope(Folder.convert(Collections.singleton(data)))); //XXX: should be a no-index variant! - Map> output = toDebugOutput(result); - Map> golden = new HashMap>(); - - golden.put(data.getURL().toExternalForm(), new HashSet(Arrays.asList("src1/test/Test1.java", "src2/test/Test1.java"))); - - assertEquals(golden, output); - } - - private FileObject workdir; - private FileObject src1; - private FileObject src2; - private FileObject src3; - private FileObject empty; - private ClassPath sourceCP; - - private void prepareTest() throws Exception { - workdir = SourceUtilsTestUtil.makeScratchDir(this); - - src1 = FileUtil.createFolder(workdir, "src1"); - src2 = FileUtil.createFolder(workdir, "src2"); - src3 = FileUtil.createFolder(workdir, "src3"); - empty = FileUtil.createFolder(workdir, "empty"); - - ClassPathProviderImpl.setSourceRoots(Arrays.asList(src1, src2, src3)); - - FileObject cache = FileUtil.createFolder(workdir, "cache"); - - CacheFolder.setCacheFolder(cache); - } - - private Map> toDebugOutput(BatchResult result) throws Exception { - Map> output = new HashMap>(); - - for (Entry> e : result.getResourcesWithRoots().entrySet()) { - Collection resourcesRepr = new HashSet(); - - for (Resource r : e.getValue()) { - resourcesRepr.add(r.getRelativePath()); - } - - output.put(e.getKey().getURL().toExternalForm(), resourcesRepr); - } - - return output; - } - - private Map>> verifiedSpans(BatchResult candidates, boolean doNotRegisterClassPath) throws Exception { - final Map>> result = new HashMap>>(); - List errors = new LinkedList(); - BatchSearch.getVerifiedSpans(candidates, new ProgressHandleWrapper(1), new BatchSearch.VerifiedSpansCallBack() { - public void groupStarted() {} - public boolean spansVerified(CompilationController wc, Resource r, Collection hints) throws Exception { - Map> files = result.get(r.getRoot().getURL().toExternalForm()); - - if (files == null) { - result.put(r.getRoot().getURL().toExternalForm(), files = new HashMap>()); - } - - Collection currentHints = new LinkedList(); - - for (ErrorDescription ed : hints) { - currentHints.add(ed.toString()); - } - - files.put(r.getRelativePath(), currentHints); - - return true; - } - public void groupFinished() {} - public void cannotVerifySpan(Resource r) { - fail("Cannot verify: " +r.getRelativePath()); - } - }, doNotRegisterClassPath, errors, new AtomicBoolean()); - - return result; - } - - @ServiceProvider(service=ClassPathProvider.class) - public static final class ClassPathProviderImpl implements ClassPathProvider { - - private static Collection sourceRoots; - - public synchronized static void setSourceRoots(Collection sourceRoots) { - ClassPathProviderImpl.sourceRoots = sourceRoots; - } - - public synchronized static Collection getSourceRoots() { - return sourceRoots; - } - - public synchronized ClassPath findClassPath(FileObject file, String type) { - if (ClassPath.BOOT.equals(type)) { - return ClassPathSupport.createClassPath(getBootClassPath().toArray(new URL[0])); - } - - if (ClassPath.COMPILE.equals(type)) { - return ClassPathSupport.createClassPath(new URL[0]); - } - - if (ClassPath.SOURCE.equals(type) && sourceRoots != null) { - for (FileObject sr : sourceRoots) { - if (file.equals(sr) || FileUtil.isParentOf(sr, file)) { - return ClassPathSupport.createClassPath(sr); - } - } - } - - return null; - } - - } - - //TODO: copied from SourceUtilsTestUtil: - private static List bootClassPath; - - public static synchronized List getBootClassPath() { - if (bootClassPath == null) { - try { - String cp = System.getProperty("sun.boot.class.path"); - List urls = new ArrayList(); - String[] paths = cp.split(Pattern.quote(System.getProperty("path.separator"))); - - for (String path : paths) { - java.io.File f = new java.io.File(path); - - if (!f.canRead()) - continue; - - FileObject fo = FileUtil.toFileObject(f); - - if (FileUtil.isArchiveFile(fo)) { - fo = FileUtil.getArchiveRoot(fo); - } - - if (fo != null) { - urls.add(fo.getURL()); - } - } - - bootClassPath = urls; - } catch (FileStateInvalidException e) { - Exceptions.printStackTrace(e); - } - } - - return bootClassPath; - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchUtilitiesTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchUtilitiesTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,222 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2011 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl.batch; - -import org.netbeans.modules.java.hints.spiimpl.batch.TestUtils.File; -import org.netbeans.modules.java.hints.spiimpl.MessageImpl; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearchTest.ClassPathProviderImpl; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; -import org.netbeans.api.editor.mimelookup.MimePath; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.classpath.GlobalPathRegistry; -import org.netbeans.api.java.lexer.JavaTokenId; -import org.netbeans.api.java.source.ModificationResult; -import org.netbeans.api.java.source.SourceUtilsTestUtil; -import org.netbeans.api.java.source.TestUtilities; -import org.netbeans.api.lexer.InputAttributes; -import org.netbeans.api.lexer.Language; -import org.netbeans.api.lexer.LanguagePath; -import org.netbeans.api.lexer.Token; -import org.netbeans.core.startup.Main; -import org.netbeans.junit.NbTestCase; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.BatchResult; -import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Folder; -import org.netbeans.modules.java.source.parsing.JavacParser; -import org.netbeans.modules.parsing.impl.indexing.CacheFolder; -import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater; -import org.netbeans.spi.editor.mimelookup.MimeDataProvider; -import org.netbeans.spi.java.classpath.support.ClassPathSupport; -import org.netbeans.spi.lexer.LanguageEmbedding; -import org.netbeans.spi.lexer.LanguageProvider; -import org.openide.LifecycleManager; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; - -import org.openide.loaders.DataObject; -import org.openide.util.Lookup; -import org.openide.util.lookup.Lookups; -import org.openide.util.lookup.ServiceProvider; -import static org.netbeans.modules.java.hints.spiimpl.batch.TestUtils.writeFilesAndWaitForScan; -import static org.netbeans.modules.java.hints.spiimpl.batch.TestUtils.prepareHints; -import org.netbeans.modules.parsing.impl.indexing.MimeTypes; - -/** - * - * @author lahvac - */ -public class BatchUtilitiesTest extends NbTestCase { - - public BatchUtilitiesTest(String name) { - super(name); - } - - //XXX: copied from CustomIndexerImplTest: - @Override - protected void setUp() throws Exception { - SourceUtilsTestUtil.prepareTest(new String[] {"org/netbeans/modules/java/source/resources/layer.xml", "org/netbeans/lib/java/lexer/layer.xml"}, new Object[0]); - Main.initializeURLFactory(); - org.netbeans.api.project.ui.OpenProjects.getDefault().getOpenProjects(); - prepareTest(); - MimeTypes.setAllMimeTypes(Collections.singleton("text/x-java")); - GlobalPathRegistry.getDefault().register(ClassPath.SOURCE, new ClassPath[] {ClassPathSupport.createClassPath(src1, src2)}); - RepositoryUpdater.getDefault().start(true); - super.setUp(); - } - - public void testBatchSearchNotIndexed() throws Exception { - writeFilesAndWaitForScan(src1, - new File("test/Test1.java", "package test; public class Test1 { private void test() { java.io.File f = null; f.isDirectory(); } }"), - new File("test/Test2.java", "package test; public class Test2 { private void test() { new javax.swing.ImageIcon(null); } }")); - writeFilesAndWaitForScan(src3, - new File("test/Test1.java", "package test; public class Test1 { private void test() { java.io.File f = null; f.isDirectory(); } }"), - new File("test/Test2.java", "package test; public class Test2 { public boolean isDirectory() {return false} }")); - - Iterable hints = prepareHints("$1.isDirectory() => !$1.isFile()", "$1", "java.io.File"); - BatchResult result = BatchSearch.findOccurrences(hints, Scopes.specifiedFoldersScope(Folder.convert(src1, src3, empty))); - List problems = new LinkedList(); - Collection changes = BatchUtilities.applyFixes(result, new ProgressHandleWrapper(100), new AtomicBoolean(), problems); - - assertTrue(problems.toString(), problems.isEmpty()); - - Map file2New = new HashMap(); - - for (ModificationResult mr : changes) { - for (FileObject file : mr.getModifiedFileObjects()) { - assertNull(file2New.put(file, mr.getResultingSource(file))); - } - } - - FileObject src1Test1 = src1.getFileObject("test/Test1.java"); - String src1Test1Real = file2New.remove(src1Test1); - String src1Test1Golden = "package test; public class Test1 { private void test() { java.io.File f = null; !f.isFile(); } }"; - - assertEquals(src1Test1Golden, src1Test1Real); - - FileObject src3Test1 = src3.getFileObject("test/Test1.java"); - String src3Test1Real = file2New.remove(src3Test1); - String src3Test1Golden = "package test; public class Test1 { private void test() { java.io.File f = null; !f.isFile(); } }"; - - assertEquals(src3Test1Golden, src3Test1Real); - - assertTrue(file2New.toString(), file2New.isEmpty()); - } - -// public void testRemoveUnusedImports() throws Exception { -// writeFilesAndWaitForScan(src1, -// new File("test/Test1.java", "package test;\n import java.util.List;\n public class Test1 { }")); -// writeFilesAndWaitForScan(src2, -// new File("test/Test2.java", "package test;\n import java.util.LinkedList;\n public class Test2 { }")); -// -// FileObject test1 = src1.getFileObject("test/Test1.java"); -// FileObject test2 = src2.getFileObject("test/Test2.java"); -// -// System.err.println(DataObject.find(test1).getClass()); -// BatchUtilities.removeUnusedImports(Arrays.asList(test1, test2)); -// -// LifecycleManager.getDefault().saveAll(); -// -// assertEquals("package test;\n public class Test1 { }", TestUtilities.copyFileToString(FileUtil.toFile(test1))); -// assertEquals("package test;\n public class Test2 { }", TestUtilities.copyFileToString(FileUtil.toFile(test2))); -// } - - private FileObject src1; - private FileObject src2; - private FileObject src3; - private FileObject empty; - - private void prepareTest() throws Exception { - FileObject workdir = SourceUtilsTestUtil.makeScratchDir(this); - - src1 = FileUtil.createFolder(workdir, "src1"); - src2 = FileUtil.createFolder(workdir, "src2"); - src3 = FileUtil.createFolder(workdir, "src3"); - empty = FileUtil.createFolder(workdir, "empty"); - - ClassPathProviderImpl.setSourceRoots(Arrays.asList(src1, src2, src3)); - - FileObject cache = FileUtil.createFolder(workdir, "cache"); - - CacheFolder.setCacheFolder(cache); - } - - @ServiceProvider(service=MimeDataProvider.class) - public static final class JavaLexerProvider implements MimeDataProvider { - - private Lookup javaLookup = Lookups.fixed(JavaTokenId.language()); - - public Lookup getLookup(MimePath mimePath) { - if (mimePath.getPath().endsWith(JavacParser.MIME_TYPE)) { - return javaLookup; - } - - return Lookup.EMPTY; - } - - } - - @ServiceProvider(service=LanguageProvider.class) - public static final class JavaLanguageProvider extends LanguageProvider { - - @Override - public Language findLanguage(String mimeType) { - if ("text/x-java".equals(mimeType)) { - return JavaTokenId.language(); - } - - return null; - } - - @Override - public LanguageEmbedding findLanguageEmbedding(Token token, LanguagePath languagePath, InputAttributes inputAttributes) { - return null; - } - - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/batch/ProgressHandleWrapperTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/batch/ProgressHandleWrapperTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2011 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl.batch; - -import org.netbeans.junit.NbTestCase; - -/** - * - * @author lahvac - */ -public class ProgressHandleWrapperTest extends NbTestCase { - - public ProgressHandleWrapperTest(String name) { - super(name); - } - - public void testNoProgress() { - ProgressHandleWrapper w = new ProgressHandleWrapper(new ProgressHandleWrapper.ProgressHandleAbstraction() { - public void start(int totalWork) {} - public void progress(int currentWorkDone) {} - public void progress(String message) {} - public void finish() {} - }, 1); - - w.finish(); - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/batch/TestUtils.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/batch/TestUtils.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,135 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2011 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl.batch; - -import java.util.Collection; -import java.util.Collections; -import org.netbeans.spi.java.hints.HintContext; -import org.netbeans.modules.java.hints.providers.spi.HintDescription.Worker; -import org.netbeans.modules.java.hints.providers.spi.Trigger.PatternDescription; -import org.netbeans.spi.java.hints.ErrorDescriptionFactory; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.modules.java.hints.providers.spi.HintDescriptionFactory; -import java.util.HashMap; -import java.util.Map; -import org.netbeans.api.java.source.SourceUtils; -import org.netbeans.api.java.source.TestUtilities; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; - -import static org.junit.Assert.*; -import org.netbeans.spi.java.hints.JavaFixUtilities; - -/** - * - * @author lahvac - */ -public class TestUtils { - - public static void writeFiles(FileObject sourceRoot, File... files) throws Exception { - for (FileObject c : sourceRoot.getChildren()) { - c.delete(); - } - - for (File f : files) { - FileObject fo = FileUtil.createData(sourceRoot, f.filename); - TestUtilities.copyStringToFile(fo, f.content); - } - } - - public static void writeFilesAndWaitForScan(FileObject sourceRoot, File... files) throws Exception { - writeFiles(sourceRoot, files); - SourceUtils.waitScanFinished(); - } - - public static final class File { - public final String filename; - public final String content; - public final boolean index; - - public File(String filename, String content) { - this(filename, content, true); - } - - public File(String filename, String content, boolean index) { - this.filename = filename; - this.content = content; - this.index = index; - } - } - - public static Iterable prepareHints(String rule, String... constraints) { - final String[] split = rule.split("=>"); - - Worker w; - - if (split.length == 2) { - w = new HintDescription.Worker() { - @Override public Collection createErrors(HintContext ctx) { - return Collections.singletonList(ErrorDescriptionFactory.forName(ctx, ctx.getPath(), "", JavaFixUtilities.rewriteFix(ctx, "", ctx.getPath(), split[1]))); - } - }; - } else { - w = new HintDescription.Worker() { - @Override public Collection createErrors(HintContext ctx) { - return Collections.singletonList(ErrorDescriptionFactory.forName(ctx, ctx.getPath(), "")); - } - }; - } - - assertTrue(constraints.length % 2 == 0); - - Map constr = new HashMap(); - - for (int i = 0; i < constraints.length; i += 2) { - constr.put(constraints[i], constraints[i + 1]); - } - - HintDescription hd = HintDescriptionFactory.create() - .setTrigger(PatternDescription.create(split[0], constr)) - .setWorker(w) - .produce(); - - return Collections.singletonList(hd); - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvokerTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/hints/HintsInvokerTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,895 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl.hints; - -import com.sun.source.tree.Tree.Kind; -import com.sun.source.util.TreePath; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.swing.text.Document; -import static org.junit.Assert.*; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.modules.java.hints.spiimpl.TestBase; -import org.netbeans.spi.java.hints.HintContext; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import org.netbeans.modules.java.hints.providers.spi.HintDescription.Worker; -import org.netbeans.modules.java.hints.providers.spi.HintDescriptionFactory; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata; -import org.netbeans.modules.java.hints.providers.spi.HintMetadata.Options; -import org.netbeans.modules.java.hints.providers.spi.Trigger.Kinds; -import org.netbeans.modules.java.hints.providers.spi.Trigger.PatternDescription; -import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings; -import org.netbeans.spi.java.hints.ErrorDescriptionFactory; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.editor.hints.Fix; -import org.netbeans.spi.java.hints.JavaFixUtilities; -import org.openide.LifecycleManager; -import org.openide.cookies.EditorCookie; -import org.openide.filesystems.FileObject; -import org.openide.loaders.DataObject; - -/** - * - * @author user - */ -public class HintsInvokerTest extends TestBase { - - public HintsInvokerTest(String name) { - super(name); - } - -// public static TestSuite suite() { -// NbTestSuite r = new NbTestSuite(); -// r.addTest(new HintsInvokerTest("testPatternVariable1")); -// return r; -// } - - public void testPattern1() throws Exception { - performAnalysisTest("test/Test.java", - "|package test;\n" + - "import java.io.File;\n" + - "public class Test {\n" + - " private void test(File f) {\n" + - " f.toURL();\n" + - " }\n" + - "}\n", - "4:11-4:16:verifier:HINT"); - } - - public void testPattern2() throws Exception { - performAnalysisTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private void test(java.io.File f) {\n" + - " f.toURL();\n" + - " }\n" + - "}\n", - "4:11-4:16:verifier:HINT"); - } - - public void testKind1() throws Exception { - performAnalysisTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private void test(java.io.File f) {\n" + - " f.toURL();\n" + - " }\n" + - "}\n", - "4:11-4:16:verifier:HINT"); - } - - public void DISABLEDtestPatternVariable1() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private void test() {\n" + - " {\n" + - " int y;\n" + - " y = 1;\n" + - " }\n" + - " int z;\n" + - " {\n" + - " int y;\n" + - " z = 1;\n" + - " }\n" + - " }\n" + - "}\n", - "4:9-7:10:verifier:HINT", - "FixImpl", - "package test; public class Test { private void test() { { int y = 1; } int z; { int y; z = 1; } } } "); - } - - public void testPatternAssert1() throws Exception { - performAnalysisTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private void test() {\n" + - " assert true : \"\";\n" + - " }\n" + - "}\n", - "4:9-4:15:verifier:HINT"); - } - - public void testPatternStatementAndSingleStatementBlockAreSame() throws Exception { - performAnalysisTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private int test() {\n" + - " if (true) {\n" + - " return 0;\n" + - " }\n" + - " }\n" + - "}\n", - "4:9-4:11:verifier:HINT"); - } - - public void testPatternFalseOccurrence() throws Exception { - performAnalysisTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private int test(java.io.File f) {\n" + - " f.toURI().toURL();\n" + - " }\n" + - "}\n"); - } - - public void testStatementVariables1() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private int test(java.io.File f) {\n" + - " if (true)\n" + - " System.err.println(1);\n" + - " else\n" + - " System.err.println(2);\n" + - " }\n" + - "}\n", - "4:9-4:11:verifier:HINT", - "FixImpl", - ("package test;\n" + - "\n" + - "public class Test {\n" + - " private int test(java.io.File f) {\n" + - " if (false)\n" + - " System.err.println(2);\n" + - " else\n" + - " System.err.println(1);\n" + - " }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testStatementVariables2() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private int test(java.io.File f) {\n" + - " if (true)\n" + - " return 1;\n" + - " else\n" + - " return 2;\n" + - " }\n" + - "}\n", - "4:9-4:11:verifier:HINT", - "FixImpl", - ("package test;\n" + - "\n" + - "public class Test {\n" + - " private int test(java.io.File f) {\n" + - " if (false)\n" + - " return 2;\n" + - " else\n" + - " return 1;\n" + - " }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testMultiStatementVariables1() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private int test(int j) {\n" + - " j++;\n" + - " j++;\n" + - " int i = 3;\n" + - " j++;\n" + - " j++;\n" + - " return i;\n" + - " }\n" + - "}\n", - "3:29-10:6:verifier:HINT", - "FixImpl", - ("package test;\n" + - "\n" + - "public class Test {\n" + - " private int test(int j) {\n" + - " j++;\n" + - " j++;\n" + - " float i = 3;\n" + - " j++;\n" + - " j++;\n" + - " return i;\n" + - " }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testMultiStatementVariables2() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private int test(int j) {\n" + - " int i = 3;\n" + - " return i;\n" + - " }\n" + - "}\n", - "3:29-6:6:verifier:HINT", - "FixImpl", - ("package test;\n" + - "\n" + - "public class Test {\n" + - " private int test(int j) {\n" + - " float i = 3;\n" + - " return i;\n" + - " }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testMultiStatementVariables3() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private int test() {\n" + - " System.err.println();\n" + - " System.err.println();\n" + - " int i = 3;\n" + - " System.err.println(i);\n" + - " System.err.println(i);\n" + - " return i;\n" + - " }\n" + - "}\n", - "3:24-10:6:verifier:HINT", - "FixImpl", - ("package test;\n" + - "\n" + - "public class Test {\n" + - " private int test() {\n" + - " System.err.println();\n" + - " System.err.println();\n" + - " float i = 3;\n" + - " System.err.println(i);\n" + - " System.err.println(i);\n" + - " return i;\n" + - " }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testMultiStatementVariablesAndBlocks() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private void test() {" + - " if (true)\n" + - " System.err.println();\n" + - " }\n" + - "}\n", - "3:35-3:37:verifier:HINT", - "FixImpl", - ("package test;\n" + - "\n" + - "public class Test {\n" + - " private void test() {" + - " if (false) {\n" + - " System.err.println();\n" + - " }\n" + - " }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testOneStatement2MultipleBlock() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private void test() {\n" + - " System.err.println(\"\");\n" + - " }\n" + - "}\n", - "4:9-4:32:verifier:HINT", - "FixImpl", - ("package test;\n" + - "\n" + - "public class Test {\n" + - " private void test() {\n" + - " System.err.println(\"\");\n" + - " System.err.println(\"\");\n" + - " }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testOneStatement2MultipleStatement() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private void test() {\n" + - " if (true)\n" + - " System.err.println(\"\");\n" + - " }\n" + - "}\n", - "5:13-5:36:verifier:HINT", - "FixImpl", - ("package test;\n" + - "\n" + - "public class Test {\n" + - " private void test() {\n" + - " if (true) {\n" + - " System.err.println(\"\");\n" + - " System.err.println(\"\");\n" + - " }\n" + - " }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testMultiple2OneStatement1() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private void test() {\n" + - " System.err.println(\"\");\n" + - " System.err.println(\"\");\n" + - " }\n" + - "}\n", - "4:9-4:32:verifier:HINT", - "FixImpl", - ("package test;\n" + - "\n" + - "public class Test {\n" + - " private void test() {\n" + - " System.err.println(\"\");\n" + - " }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testMultiple2OneStatement2() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private void test() {\n" + - " int i = 0;\n" + - " System.err.println(\"\");\n" + - " System.err.println(\"\");\n" + - " i++;\n" + - " }\n" + - "}\n", - "5:9-5:32:verifier:HINT", - "FixImpl", - ("package test;\n" + - "\n" + - "public class Test {\n" + - " private void test() {\n" + - " int i = 0;\n" + - " System.err.println(\"\");\n" + - " i++;\n" + - " }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testMemberSelectInsideMemberSelect() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " public Test test;\n" + - " public String name;\n" + - " private void test() {\n" + - " Test t = null;\n" + - " String s = t.test.toString();\n" + - " }\n" + - "}\n", - "7:22-7:26:verifier:HINT", - "FixImpl", - ("package test;\n" + - "\n" + - "public class Test {\n" + - " public Test test;\n" + - " public String name;\n" + - " private void test() {\n" + - " Test t = null;\n" + - " String s = t.getTest().toString();\n" + - " }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testPackageInfo() throws Exception { - performAnalysisTest("test/package-info.java", - "|package test;\n"); - } - - public void testSuppressWarnings() throws Exception { - performAnalysisTest("test/Test.java", - "|package test;\n" + - "@SuppressWarnings(\"test\")\n" + - "public class Test {\n" + - " public Test test;\n" + - " public String name;\n" + - " private void test() {\n" + - " Test t = null;\n" + - " String s = t.test.toString();\n" + - " }\n" + - "}\n"); - } - - public void testRewriteOneToMultipleClassMembers() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private int i;\n" + - "}\n", - "3:17-3:18:verifier:HINT", - "FixImpl", - ("package test;\n" + - "\n" + - "public class Test {\n" + - " private int i;\n" + - " public int getI() {\n" + - " return i;\n" + - " }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testImports1() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "\n" + - "public class Test {\n" + - " private void test() {\n" + - " new java.util.LinkedList();\n" + - " }" + - "}\n", - "4:9-4:35:verifier:HINT", - "FixImpl", - ("package test;\n" + - "import java.util.ArrayList;\n" + - "public class Test {\n" + - " private void test() {\n" + - " new ArrayList();\n" + - " }" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testImports2() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "import java.util.LinkedList;\n" + - "public class Test {\n" + - " private void test() {\n" + - " LinkedList l;\n" + - " }" + - "}\n", - "4:20-4:21:verifier:HINT", - "FixImpl", - ("package test;\n" + - "import java.util.ArrayList;\n" + - "import java.util.LinkedList;\n" + - "public class Test {\n" + - " private void test() {\n" + - " ArrayList l;\n" + - " }" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testMultiParameters() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "import java.util.Arrays;\n" + - "public class Test {\n" + - " { Arrays.asList(\"a\", \"b\", \"c\"); }\n" + - "}\n", - "3:14-3:20:verifier:HINT", - "FixImpl", - ("package test;\n" + - "import java.util.Arrays;\n" + - "public class Test {\n" + - " { Arrays.asList(\"d\", \"a\", \"b\", \"c\"); }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testTypeParametersMethod() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "import java.util.Arrays;\n" + - "public class Test {\n" + - " { Arrays.asList(\"a\", \"b\", \"c\"); }\n" + - "}\n", - "3:22-3:28:verifier:HINT", - "FixImpl", - ("package test;\n" + - "import java.util.Arrays;\n" + - "public class Test {\n" + - " { Arrays.asList(\"d\", \"a\", \"b\", \"c\"); }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testTypeParametersNewClass() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "import java.util.Arrays;\n" + - "import java.util.HashSet;\n" + - "public class Test {\n" + - " { new HashSet(Arrays.asList(\"a\", \"b\", \"c\")); }\n" + - "}\n", - "4:7-4:64:verifier:HINT", - "FixImpl", - ("package test;\n" + - "import java.util.Arrays;\n" + - "import java.util.HashSet;\n" + - "public class Test {\n" + - " { new HashSet(Arrays.asList(\"d\", \"a\", \"b\", \"c\")); }\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testChangeFieldType1() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "public class Test {\n" + - " private String name = null;\n" + - "}\n", - "2:20-2:24:verifier:HINT", - "FixImpl", - ("package test;\n" + - "public class Test {\n" + - " private CharSequence name = null;\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testChangeFieldType2() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "public class Test {\n" + - " String name = null;\n" + - "}\n", - "2:12-2:16:verifier:HINT", - "FixImpl", - ("package test;\n" + - "public class Test {\n" + - " CharSequence name = null;\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testChangeFieldType3() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "public class Test {\n" + - " private static final String name = \"test\".substring(0, 4);\n" + - "}\n", - "2:33-2:37:verifier:HINT", - "FixImpl", - ("package test;\n" + - "public class Test {\n" + - " private static final CharSequence name = \"test\".substring(0, 4);\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testIdentifier() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "public class Test {\n" + - " private int l;" + - " {System.err.println(l);}\n" + - "}\n", - "2:44-2:45:verifier:HINT", - "FixImpl", - ("package test;\n" + - "public class Test {\n" + - " private int l;" + - " {System.err.println(2);}\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - public void testLambda() throws Exception { - performAnalysisTest("test/Test.java", - "|package test;\n" + - "public class Test {\n" + - " { new java.io.FileFilter() {public boolean accept(java.io.File f) { return true; } } }\n" + - "}\n", - "2:7-2:89:verifier:HINT"); - } - - public void testAddCasesToSwitch() throws Exception { - performFixTest("test/Test.java", - "|package test;\n" + - "public class Test {\n" + - " {\n" + - " E e = null;\n" + - " switch (e) {\n" + - " case A: System.err.println(1); break;\n" + - " case D: System.err.println(2); break;\n" + - " case E: System.err.println(3); break;\n" + - " }\n" + - " }\n" + - " public enum E {A, B, C, D, E, F;}\n" + - "}\n", - "4:9-4:15:verifier:HINT", - "FixImpl", - ("package test;\n" + - "public class Test {\n" + - " {\n" + - " E e = null;\n" + - " switch (e) {\n" + - " case A: System.err.println(1); break;\n" + - " case B:case C:\n" + -// " case C:\n" + - " case D: System.err.println(2); break;\n" + - " case E: System.err.println(3); break;\n" + - " }\n" + - " }\n" + - " public enum E {A, B, C, D, E, F;}\n" + - "}\n").replaceAll("[ \t\n]+", " ")); - } - - private static final Map test2Hint; - - static { - test2Hint = new HashMap(); - test2Hint.put("testPattern1", HintDescriptionFactory.create().setTrigger(PatternDescription.create("$1.toURL()", Collections.singletonMap("$1", "java.io.File"))).setWorker(new WorkerImpl()).produce()); - test2Hint.put("testPattern2", test2Hint.get("testPattern1")); - test2Hint.put("testKind1", HintDescriptionFactory.create().setTrigger(new Kinds(EnumSet.of(Kind.METHOD_INVOCATION))).setWorker(new WorkerImpl()).produce()); - test2Hint.put("testPatternVariable1", HintDescriptionFactory.create().setTrigger(PatternDescription.create("{ $1 $2; $2 = $3; }", Collections.emptyMap())).setWorker(new WorkerImpl("{ $1 $2 = $3; }")).produce()); - Map constraints = new HashMap(); - - constraints.put("$1", "boolean"); - constraints.put("$2", "java.lang.Object"); - - test2Hint.put("testPatternAssert1", HintDescriptionFactory.create().setTrigger(PatternDescription.create("assert $1 : $2;", constraints)).setWorker(new WorkerImpl()).produce()); - test2Hint.put("testPatternStatementAndSingleStatementBlockAreSame", HintDescriptionFactory.create().setTrigger(PatternDescription.create("if ($1) return $2;", Collections.emptyMap())).setWorker(new WorkerImpl()).produce()); - test2Hint.put("testPatternFalseOccurrence", HintDescriptionFactory.create().setTrigger(PatternDescription.create("$1.toURL()", Collections.singletonMap("$1", "java.io.File"))).setWorker(new WorkerImpl()).produce()); - test2Hint.put("testStatementVariables1", HintDescriptionFactory.create().setTrigger(PatternDescription.create("if ($1) $2; else $3;", constraints)).setWorker(new WorkerImpl("if (!$1) $3; else $2;")).produce()); - test2Hint.put("testStatementVariables2", test2Hint.get("testStatementVariables1")); - test2Hint.put("testMultiStatementVariables1", HintDescriptionFactory.create().setTrigger(PatternDescription.create("{ $pref$; int $i = 3; $inf$; return $i; }", Collections.emptyMap())).setWorker(new WorkerImpl("{ $pref$; float $i = 3; $inf$; return $i; }")).produce()); - test2Hint.put("testMultiStatementVariables2", test2Hint.get("testMultiStatementVariables1")); - test2Hint.put("testMultiStatementVariables3", test2Hint.get("testMultiStatementVariables1")); - test2Hint.put("testMultiStatementVariablesAndBlocks", HintDescriptionFactory.create().setTrigger(PatternDescription.create("if ($c) {$s1$; System.err.println(); $s2$; }", Collections.emptyMap())).setWorker(new WorkerImpl("if (!$c) {$s1$; System.err.println(); $s2$; }")).produce()); - test2Hint.put("testOneStatement2MultipleBlock", HintDescriptionFactory.create().setTrigger(PatternDescription.create("System.err.println($1);", Collections.emptyMap())).setWorker(new WorkerImpl("System.err.println($1); System.err.println($1);")).produce()); - test2Hint.put("testOneStatement2MultipleStatement", test2Hint.get("testOneStatement2MultipleBlock")); - test2Hint.put("testMultiple2OneStatement1", HintDescriptionFactory.create().setTrigger(PatternDescription.create("System.err.println($1); System.err.println($2);", Collections.emptyMap())).setWorker(new WorkerImpl("System.err.println($1);")).produce()); - test2Hint.put("testMultiple2OneStatement2", test2Hint.get("testMultiple2OneStatement1")); - test2Hint.put("testMemberSelectInsideMemberSelect", HintDescriptionFactory.create().setTrigger(PatternDescription.create("$Test.test", Collections.singletonMap("$Test", "test.Test"))).setWorker(new WorkerImpl("$Test.getTest()")).produce()); - test2Hint.put("testPackageInfo", HintDescriptionFactory.create().setTrigger(PatternDescription.create("$Test.test", Collections.singletonMap("$Test", "test.Test"))).setWorker(new WorkerImpl("$Test.getTest()")).produce()); - HintMetadata metadata = HintMetadata.Builder.create("no-id").addOptions(Options.NON_GUI).addSuppressWarnings("test").build(); - test2Hint.put("testSuppressWarnings", HintDescriptionFactory.create().setTrigger(PatternDescription.create("$Test.test", Collections.singletonMap("$Test", "test.Test"))).setWorker(new WorkerImpl("$Test.getTest()")).setMetadata(metadata).produce()); - test2Hint.put("testRewriteOneToMultipleClassMembers", HintDescriptionFactory.create().setTrigger(PatternDescription.create("private int i;", Collections.emptyMap())).setWorker(new WorkerImpl("private int i; public int getI() { return i; }")).produce()); -// test2Hint.put("testImports1", HintDescriptionFactory.create().setTrigger(PatternDescription.create("new LinkedList()", Collections.emptyMap(), "import java.util.LinkedList;")).setWorker(new WorkerImpl("new ArrayList()", "import java.util.ArrayList;\n")).produce()); -// test2Hint.put("testImports2", HintDescriptionFactory.create().setTrigger(PatternDescription.create("LinkedList $0;", Collections.emptyMap(), "import java.util.LinkedList;")).setWorker(new WorkerImpl("ArrayList $0;", "import java.util.ArrayList;\n")).produce()); - test2Hint.put("testImports1", HintDescriptionFactory.create().setTrigger(PatternDescription.create("new LinkedList()", Collections.emptyMap(), "import java.util.LinkedList;")).setWorker(new WorkerImpl("new java.util.ArrayList()")).produce()); - test2Hint.put("testImports2", HintDescriptionFactory.create().setTrigger(PatternDescription.create("LinkedList $0;", Collections.emptyMap(), "import java.util.LinkedList;")).setWorker(new WorkerImpl("java.util.ArrayList $0;")).produce()); - test2Hint.put("testMultiParameters", HintDescriptionFactory.create().setTrigger(PatternDescription.create("java.util.Arrays.asList($1$)", Collections.emptyMap())).setWorker(new WorkerImpl("java.util.Arrays.asList(\"d\", $1$)")).produce()); - test2Hint.put("testTypeParametersMethod", HintDescriptionFactory.create().setTrigger(PatternDescription.create("java.util.Arrays.<$T>asList($1$)", Collections.emptyMap())).setWorker(new WorkerImpl("java.util.Arrays.<$T>asList(\"d\", $1$)")).produce()); - test2Hint.put("testTypeParametersNewClass", HintDescriptionFactory.create().setTrigger(PatternDescription.create("new java.util.HashSet<$T1$>(java.util.Arrays.<$T$>asList($1$))", Collections.emptyMap())).setWorker(new WorkerImpl("new java.util.HashSet<$T1$>(java.util.Arrays.<$T$>asList(\"d\", $1$))")).produce()); - test2Hint.put("testChangeFieldType1", HintDescriptionFactory.create().setTrigger(PatternDescription.create("$modifiers$ java.lang.String $name = $initializer;", Collections.emptyMap())).setWorker(new WorkerImpl("$modifiers$ java.lang.CharSequence $name = $initializer;")).produce()); - test2Hint.put("testChangeFieldType2", test2Hint.get("testChangeFieldType1")); - test2Hint.put("testChangeFieldType3", test2Hint.get("testChangeFieldType1")); - test2Hint.put("testIdentifier", HintDescriptionFactory.create().setTrigger(PatternDescription.create("$i", Collections.singletonMap("$i", "int"))).setWorker(new WorkerImpl("2")).produce()); - test2Hint.put("testLambda", HintDescriptionFactory.create().setTrigger(PatternDescription.create("new $type() { $mods$ $retType $name($params$) { $body$; } }", Collections.emptyMap())).setWorker(new WorkerImpl()).produce()); - test2Hint.put("testAddCasesToSwitch", HintDescriptionFactory.create().setTrigger(PatternDescription.create("switch ($var) { case $c1$; case D: $stmts$; case $c2$; }", Collections.singletonMap("$var", "test.Test.E"))).setWorker(new WorkerImpl("switch ($var) { case $c1$ case B: case C: case D: $stmts$; case $c2$ }")).produce()); - } - -// @Override - protected List computeErrors(CompilationInfo info, TreePath path, int pos) { - HintDescription hd = test2Hint.get(getName()); - - assertNotNull(hd); - - return new HintsInvoker(HintsSettings.getGlobalSettings(), new AtomicBoolean()).computeHints(info, Collections.singletonList(hd)); - } - -// @Override - protected String toDebugString(CompilationInfo info, Fix f) { - return "FixImpl"; - } - -// @Override -// public void testIssue105979() throws Exception {} -// -// @Override -// public void testIssue108246() throws Exception {} -// -// @Override -// public void testIssue113933() throws Exception {} -// -// @Override -// public void testNoHintsForSimpleInitialize() throws Exception {} - - private static final class WorkerImpl implements Worker { - - private final String fix; - - public WorkerImpl() { - this(null); - } - - public WorkerImpl(String fix) { - this.fix = fix; - } - - public Collection createErrors(HintContext ctx) { - if (ctx.getInfo().getTreeUtilities().isSynthetic(ctx.getPath())) { - return null; - } - - List fixes = new LinkedList(); - - if (fix != null) { - fixes.add(JavaFixUtilities.rewriteFix(ctx, "Rewrite", ctx.getPath(), fix)); - } - - return Collections.singletonList(ErrorDescriptionFactory.forName(ctx, ctx.getPath(), "HINT", fixes.toArray(new Fix[0]))); - } - } - - - //XXX:copied from TreeRuleTestBase: - - protected void performAnalysisTest(String fileName, String code, String... golden) throws Exception { - int[] offset = new int[1]; - - code = org.netbeans.modules.java.hints.spiimpl.TestUtilities.detectOffsets(code, offset); - - performAnalysisTest(fileName, code, offset[0], golden); - } - - protected void performAnalysisTest(String fileName, String code, int pos, String... golden) throws Exception { - prepareTest(fileName, code); - - TreePath path = info.getTreeUtilities().pathFor(pos); - - List errors = computeErrors(info, path, pos); - List errorsNames = new LinkedList(); - - errors = errors != null ? errors : Collections.emptyList(); - - for (ErrorDescription e : errors) { - errorsNames.add(e.toString()); - } - - assertTrue("The warnings provided by the hint do not match expected warnings. Provided warnings: " + errorsNames.toString(), Arrays.equals(golden, errorsNames.toArray(new String[0]))); - } - - protected String performFixTest(String fileName, String code, String errorDescriptionToString, String fixDebugString, String golden) throws Exception { - int[] offset = new int[1]; - - code = org.netbeans.modules.java.hints.spiimpl.TestUtilities.detectOffsets(code, offset); - - return performFixTest(fileName, code, offset[0], errorDescriptionToString, fixDebugString, golden); - } - - protected String performFixTest(String fileName, String code, int pos, String errorDescriptionToString, String fixDebugString, String golden) throws Exception { - return performFixTest(fileName, code, pos, errorDescriptionToString, fixDebugString, fileName, golden); - } - - protected String performFixTest(String fileName, String code, String errorDescriptionToString, String fixDebugString, String goldenFileName, String golden) throws Exception { - int[] offset = new int[1]; - - code = org.netbeans.modules.java.hints.spiimpl.TestUtilities.detectOffsets(code, offset); - - return performFixTest(fileName, code, offset[0], errorDescriptionToString, fixDebugString, goldenFileName, golden); - } - - protected String performFixTest(String fileName, String code, int pos, String errorDescriptionToString, String fixDebugString, String goldenFileName, String golden) throws Exception { - prepareTest(fileName, code); - - TreePath path = info.getTreeUtilities().pathFor(pos); - - List errors = computeErrors(info, path, pos); - - ErrorDescription toFix = null; - - for (ErrorDescription d : errors) { - if (errorDescriptionToString.equals(d.toString())) { - toFix = d; - break; - } - } - - assertNotNull("Error: \"" + errorDescriptionToString + "\" not found. All ErrorDescriptions: " + errors.toString(), toFix); - - assertTrue("Must be computed", toFix.getFixes().isComputed()); - - List fixes = toFix.getFixes().getFixes(); - List fixNames = new LinkedList(); - Fix toApply = null; - - for (Fix f : fixes) { - if (fixDebugString.equals(toDebugString(info, f))) { - toApply = f; - } - - fixNames.add(toDebugString(info, f)); - } - - assertNotNull("Cannot find fix to invoke: " + fixNames.toString(), toApply); - - toApply.implement(); - - FileObject toCheck = sourceRoot.getFileObject(goldenFileName); - - assertNotNull(toCheck); - - DataObject toCheckDO = DataObject.find(toCheck); - EditorCookie ec = toCheckDO.getLookup().lookup(EditorCookie.class); - Document toCheckDocument = ec.openDocument(); - - String realCode = toCheckDocument.getText(0, toCheckDocument.getLength()); - - //ignore whitespaces: - realCode = realCode.replaceAll("[ \t\n]+", " "); - - if (golden != null) { - assertEquals("The output code does not match the expected code.", golden, realCode); - } - - LifecycleManager.getDefault().saveAll(); - - return realCode; - } -} \ No newline at end of file diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/BulkSearchTestPerformer.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/BulkSearchTestPerformer.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,694 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl.pm; - -import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch.BulkPattern; -import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch.EncodingContext; -import com.sun.source.util.TreePath; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.regex.Pattern; -import javax.swing.text.Document; -import org.netbeans.api.java.lexer.JavaTokenId; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.JavaSource.Phase; -import org.netbeans.api.java.source.SourceUtilsTestUtil; -import org.netbeans.api.java.source.TestUtilities; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.api.lexer.Language; -import org.netbeans.junit.NbTestCase; -import org.netbeans.modules.java.source.TreeLoader; -import org.openide.cookies.EditorCookie; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; -import org.openide.loaders.DataObject; -import static org.junit.Assert.*; -import org.netbeans.junit.RandomlyFails; - -/** - * - * @author lahvac - */ -public abstract class BulkSearchTestPerformer extends NbTestCase { - - public BulkSearchTestPerformer(String name) { - super(name); - } - - @Override - protected void setUp() throws Exception { - super.setUp(); - SourceUtilsTestUtil.prepareTest(new String[] {"org/netbeans/modules/java/editor/resources/layer.xml"}, new Object[0]); - TreeLoader.DISABLE_CONFINEMENT_TEST = true; - } - -// public static TestSuite suite() { -// NbTestSuite s = new NbTestSuite(); -// -// s.addTestSuite(NFABasedBulkSearchTest.class); -// -// return s; -// } - - public void testSimple1() throws Exception { - performTest("package test; public class Test { private void test() { System.err./**/println(\"\");}}", - Collections.singletonMap("System.err.println(\"\")", Arrays.asList("System.err./**/println(\"\")")), - Arrays.asList("System.err.println(\"\" + \"\")")); - } - - public void testDontCare() throws Exception { - performTest("package test; public class Test { private void test() { System.err./**/println(\"\" + \"\");}}", - Collections.singletonMap("System.err.println($1)", Arrays.asList("System.err./**/println(\"\" + \"\")")), - Collections.emptyList()); - } - - public void testMemberSelectAndIdentifier() throws Exception { - performTest("package test; public class Test { private static void test() { test();}}", - Collections.singletonMap("test.Test.test()", Arrays.asList("test()")), - Collections.emptyList()); - } - - public void testUnpureMemberSelect() throws Exception { - performTest("package test; public class Test { private static void test() { new StringBuilder().append(\"\");}}", - Collections.>emptyMap(), - Arrays.asList("test.append(\"\")")); - } - - public void testMemberSelectWithVariables1() throws Exception { - performTest("package test; public class Test { private static void test() { new StringBuilder().append(\"\");}}", - Collections.singletonMap("$0.append(\"\")", Arrays.asList("new StringBuilder().append(\"\")")), - Collections.emptyList()); - } - - public void testMemberSelectWithVariables2() throws Exception { - performTest("package test; public class Test { private void append(char c) { append(\"\");}}", - Collections.singletonMap("$0.append(\"\")", Arrays.asList("append(\"\")")), - Collections.emptyList()); - } - - public void testLocalVariables() throws Exception { - performTest("package test; public class Test { private void test() { { int y; y = 1; } }}", - Collections.singletonMap("{ int $1; $1 = 1; }", Arrays.asList("{ int y; y = 1; }")), - Collections.emptyList()); - } - - public void testAssert() throws Exception { - performTest("package test; public class Test { private void test() { assert true : \"\"; }}", - Collections.singletonMap("assert $1 : $2;", Arrays.asList("assert true : \"\";")), - Collections.emptyList()); - } - - public void testStatementAndSingleBlockStatementAreSame1() throws Exception { - performTest("package test; public class Test { private void test() { { int y; { y = 1; } } }}", - Collections.singletonMap("{ int $1; $1 = 1; }", Arrays.asList("{ int y; { y = 1; } }")), - Collections.emptyList()); - } - - public void testStatementAndSingleBlockStatementAreSame2() throws Exception { - performTest("package test; public class Test { private void test() { { int y; y = 1; } }}", - Collections.singletonMap("{ int $1; { $1 = 1; } }", Arrays.asList("{ int y; y = 1; }")), - Collections.emptyList()); - } - - public void testStatementVariables1() throws Exception { - performTest("package test; public class Test { public int test1() { if (true) return 1; else return 2; } }", - Collections.singletonMap("if ($1) $2; else $3;", Arrays.asList("if (true) return 1; else return 2;")), - Collections.emptyList()); - } - - public void testMultiStatementVariables1() throws Exception { - performTest("package test; public class Test { public int test1(int i) { System.err.println(i); System.err.println(i); i = 3; System.err.println(i); System.err.println(i); return i; } }", - Collections.singletonMap("{ $s1$; i = 3; $s2$; return i; }", Arrays.asList("{ System.err.println(i); System.err.println(i); i = 3; System.err.println(i); System.err.println(i); return i; }")), - Collections.emptyList()); - } - - public void testMultiStatementVariables2() throws Exception { - performTest("package test; public class Test { public int test1(int i) { i = 3; return i; } }", - Collections.singletonMap("{ $s1$; i = 3; $s2$; return i; }", Arrays.asList("{ i = 3; return i; }")), - Collections.emptyList()); - } - - public void testMultiStatementVariablesAndBlocks1() throws Exception { - performTest("package test; public class Test { public void test1() { if (true) System.err.println(); } }", - Collections.singletonMap("if ($c) {$s1$; System.err.println(); $s2$; }", Arrays.asList("if (true) System.err.println();")), - Collections.emptyList()); - } - - public void testMultiStatementVariablesAndBlocks2() throws Exception { - performTest("package test; public class Test { public void test1() { if (true) System.err.println(); } }", - Collections.singletonMap("if ($c) {$s1$; System.err.println(); }", Arrays.asList("if (true) System.err.println();")), - Collections.emptyList()); - } - - public void testMultiStatementVariablesAndBlocks3() throws Exception { - performTest("package test; public class Test { public void test1() { if (true) System.err.println(); } }", - Collections.singletonMap("if ($c) {System.err.println(); $s2$; }", Arrays.asList("if (true) System.err.println();")), - Collections.emptyList()); - } - - public void testMultiStatementVariablesAndBlocks4() throws Exception { - performTest("package test; public class Test { public void test1() { if (true) System.err.println(); } }", - Collections.singletonMap("{ $s1$; System.err.println(); $s2$; }", Arrays.asList("System.err.println();")), - Collections.emptyList()); - } - - public void testTwoPatterns() throws Exception { - Map> contained = new HashMap>(); - - contained.put("if ($a) $ret = $b; else $ret = $c;", Arrays.asList("if (b) q = 2; else q = 3;")); - contained.put("{ $p$; $T $v; if($a) $v = $b; else $v = $c; $q$; }", Arrays.asList("{ int q; if (b) q = 2; else q = 3; }")); - - performTest("package test; public class Test { public void test1(boolean b) { int q; if (b) q = 2; else q = 3; } }", - contained, - Collections.emptyList()); - } - - public void testEffectiveNewClass() throws Exception { - performTest("package test; import javax.swing.ImageIcon; public class Test { public void test1(java.awt.Image i) { new ImageIcon(i); new String(i); } }", - Collections.singletonMap("new javax.swing.ImageIcon($1)", Arrays.asList("new ImageIcon(i)")), - Collections.emptyList()); - } - - public void testSynchronizedAndMultiStatementVariables() throws Exception { - performTest("package test; public class Test {public void test() { Object o = null; int i = 0; synchronized (o) {} } }", - Collections.singletonMap("synchronized($var) {$stmts$;}", Arrays.asList("synchronized (o) {}")), - Collections.emptyList()); - } - - public void testJackpot30_2() throws Exception { - String code = "package test;\n" + - "public class Test {\n" + - " private void m() {\n" + - " a(c.i().getFileObject());\n" + - " if (span != null && span[0] != (-1) && span[1] != (-1));\n" + - " }\n" + - "}\n"; - - performTest(code, - Collections.>emptyMap(), - Arrays.asList("$0.getFileObject($1)")); - } - - public void testIdentifierInPureMemberSelect() throws Exception { - String code = "package test;\n" + - "public class Test {\n" + - " public Test test;\n" + - " public String name;\n" + - " private void test() {\n" + - " Test t = null;\n" + - " String s = t.test.name;\n" + - " }\n" + - "}\n"; - - performTest(code, - Collections.singletonMap("$Test.test", Arrays.asList("test", "t.test")), - Collections.emptyList()); - } - - @RandomlyFails - public void testNoExponentialTimeComplexity() throws Exception { - try { - String code = "package test;\n" + - "public class Test {\n" + - " private void test() {\n" + - " Object o;\n" + - " if(o == null) {\n" + - " f(\"\");\n" + - " }|\n" + - " }\n" + - "}"; - String pattern = "{ $p$; $T $v; if($a) $v = $b; else $v = $c; }"; - - measure(code, "\na(\"\");", 5, pattern); //to load needed classes, etc. - - int rep = 1; - long baseline; - - while (true) { - baseline = measure(code, "\na(\"\");", rep, pattern); - - if (baseline >= 2000) { - break; - } - - rep *= 2; - } - - long doubleSize = measure(code, "\na(\"\");", 2 * rep, pattern); - - assertTrue("baseline=" + baseline + ", actual=" + String.valueOf(doubleSize), doubleSize <= 4 * baseline); - } catch (OutOfMemoryError oome) { - //OK - } - } - - public void testMultiParameter1() throws Exception { - performTest("package test; public class Test { { java.util.Arrays.asList(\"a\", \"b\", \"c\"); } }", - Collections.singletonMap("java.util.Arrays.asList($params$)", Arrays.asList("java.util.Arrays.asList(\"a\", \"b\", \"c\")")), - Collections.emptyList()); - } - - public void testMultiParameter2() throws Exception { - performTest("package test; public class Test { { java.util.Arrays.asList(); } }", - Collections.singletonMap("java.util.Arrays.asList($params$)", Arrays.asList("java.util.Arrays.asList()")), - Collections.emptyList()); - } - - public void testTypeParameter() throws Exception { - performTest("package test; public class Test { { java.util.Arrays.asList(); } }", - Collections.singletonMap("java.util.Arrays.<$1>asList($params$)", Arrays.asList("java.util.Arrays.asList()")), - Collections.emptyList()); - } - - public void testField1() throws Exception { - String code = "package test;\n" + - "public class Test {\n" + - " String name = null;\n" + - "}\n"; - - performTest(code, - Collections.singletonMap("$modifiers$ java.lang.String $name = $initializer;", Arrays.asList("String name = null;")), - Collections.emptyList()); - } - - public void testField2() throws Exception { - String code = "package test;\n" + - "public class Test {\n" + - " private String name = null;\n" + - "}\n"; - - performTest(code, - Collections.singletonMap("$modifiers$ java.lang.String $name = $initializer;", Arrays.asList("private String name = null;")), - Collections.emptyList()); - } - - public void testMemberSelectWithVariable() throws Exception { - String code = "package test;\n" + - "import java.util.Arrays;\n" + - "public class Test {" + - " {\n" + - " foo.bar(0, 3, 4);\n" + - " }\n" + - "}\n"; - - performTest(code, - Collections.singletonMap("$foo.$bar($p1, $p2$)", Arrays.asList("foo.bar(0, 3, 4)")), - Collections.emptyList()); - } - - public void testCheckIdentifiers1() throws Exception { - String code = "package test;\n" + - "import static java.util.Arrays.*;\n" + - "public class Test {" + - " {\n" + - " toString(new int[] {0, 3, 4});\n" + - " }\n" + - "}\n"; - - performTest(code, - Collections.singletonMap("java.util.Arrays.toString($x)", Arrays.asList("toString(new int[] {0, 3, 4})")), - Collections.emptyList()); - } - - public void testCheckIdentifiers2() throws Exception { - String code = "package test;\n" + - "public class Test {" + - " {\n" + - " toString(new int[] {0, 3, 4});\n" + - " }\n" + - "}\n"; - - performTest(code, - Collections.>emptyMap(), - Collections.singletonList("java.util.Arrays.toString($x)")); - } - - public void testCheckIdentifiers3() throws Exception { - String code = "package test;\n" + - "import static java.util.Arrays.*;\n" + - "public class Test {" + - " {\n" + - " Foo.toString(new int[] {0, 3, 4});\n" + - " }\n" + - "}\n"; - - performTest(code, - Collections.>emptyMap(), - Collections.singletonList("java.util.Arrays.toString($x)")); - } - - public void testCheckIdentifiers4() throws Exception { - String code = "package test;\n" + - "public class Test {" + - " {\n" + - " java.util.Arrays.toString(new int[] {0, 3, 4});\n" + - " }\n" + - "}\n"; - - performTest(code, - Collections.singletonMap("Arrays", Arrays.asList("java.util.Arrays")), //could be imported in the input pattern - Collections.emptyList()); - } - - public void testLambdaInput() throws Exception { - String code = "package test; public class Test {public void test() { new java.io.FilenameFilter() { public boolean accept(java.io.File dir, String name) { return true; } }; } }"; - - performTest(code, - Collections.singletonMap("new $type() {public $retType $name($params$) { $body$; } }", Arrays.asList("new java.io.FilenameFilter() { public boolean accept(java.io.File dir, String name) { return true; } }")), - - Collections.emptyList()); - } - - public void testDoubleCheckedLockingWithVariable() throws Exception { - String dcl = "if (o == null) {\n" + - " Object o1 = new Object();\n" + - " synchronized (Test.class) {\n" + - " if (o == null) {\n" + - " o = o1;\n" + - " }\n" + - " }\n" + - " }"; - String code = "package test;\n" + - "public class Test {\n" + - " private Object o;\n" + - " private void t() {\n" + - " " + dcl + "\n" + - " }\n" + - "}\n"; - - performTest(code, - Collections.singletonMap("if ($var == null) {$pref$; synchronized ($lock) { if ($var == null) { $init$; } } }", Arrays.asList(dcl)), - Collections.emptyList()); - } - - public void testMethodName1() throws Exception { - String code = "package test; public class Test {public void test() { clone(); } }"; - - performTest(code, - Collections.>emptyMap(), - Collections.singletonList("public void clone() {$stmts$;}")); - } - - public void testMethodName2() throws Exception { - String code = "package test; public class Test {public void test() { clone(); } }"; - - performTest(code, - Collections.singletonMap("public void test() {$stmts$;}", Arrays.asList("public void test() { clone(); }")), - Collections.emptyList()); - } - - public void testBooleanLiterals() throws Exception { - String code = "package test; public class Test { public void test() { if (false) { System.err.println(\"false\"); } if (true) { System.err.println(\"true\"); } } }"; - - performTest(code, - Collections.singletonMap("if (true) $then; else $else$;", Arrays.asList("if (true) { System.err.println(\"true\"); }")), - Collections.emptyList()); - } - - public void testEfficientMultiMatching() throws Exception { - String code = "package test; public class Test { private void m() {} }"; - - performTest(code, - Collections.>emptyMap(), - Collections.singletonList("$mods$ class $name implements $i$ { }")); - } - - private long measure(String baseCode, String toInsert, int repetitions, String pattern) throws Exception { - int pos = baseCode.indexOf('|'); - - assertTrue(pos != (-1)); - - baseCode = baseCode.replaceAll(Pattern.quote("|"), ""); - - StringBuilder code = new StringBuilder(baseCode.length() + repetitions * toInsert.length()); - - code.append(baseCode); - - while (repetitions-- > 0) { - code.insert(pos, toInsert); - } - - long startTime = System.currentTimeMillis(); - - performTest(code.toString(), - Collections.>emptyMap(), - Arrays.asList(pattern)); - - long endTime = System.currentTimeMillis(); - - return endTime - startTime; - } - - public void XtestMeasureTime() throws Exception { - String code = TestUtilities.copyFileToString(new File("/usr/local/home/lahvac/src/nb//outgoing/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionProvider.java")); - List patterns = new LinkedList(); - - for (int cntr = 0; cntr < 1000; cntr++) { - patterns.add("System.err.println($1)"); - } - - performTest(code, - Collections.>emptyMap(), - patterns); - } - - public void testMatches1() throws Exception { - performMatchesTest("package test; public class Test { private void test() { f.isDirectory(); } }", Arrays.asList("$1.isDirectory()", "new ImageIcon($1)"), true); - } - - public void testSerialization() throws Exception { - String text = "package test; public class Test { public void test1(boolean b) { int q; if (b) q = 2; else q = 3; } }"; - - prepareTest("test/Test.java", text); - - ByteArrayOutputStream out = new ByteArrayOutputStream(); - EncodingContext ec = new EncodingContext(out, false); - - createSearch().encode(info.getCompilationUnit(), ec, new AtomicBoolean()); - - boolean matches = createSearch().matches(new ByteArrayInputStream(out.toByteArray()), new AtomicBoolean(), createSearch().create(info, new AtomicBoolean(), "{ $p$; $T $v; if($a) $v = $b; else $v = $c; $q$; }")); - - assertTrue(matches); - } - - public void testFrequencies() throws Exception { - String text = "package test; public class Test { public void test1(boolean b) { java.io.File f = null; f.isDirectory(); f.isDirectory(); new javax.swing.ImageIcon(null); } }"; - - prepareTest("test/Test.java", text); - - ByteArrayOutputStream out = new ByteArrayOutputStream(); - EncodingContext ec = new EncodingContext(out, false); - - createSearch().encode(info.getCompilationUnit(), ec, new AtomicBoolean()); - - Map actual = createSearch().matchesWithFrequencies(new ByteArrayInputStream(out.toByteArray()), createSearch().create(info, new AtomicBoolean(), "$1.isDirectory()", "new ImageIcon($1)"), new AtomicBoolean()); - Map golden = new HashMap(); - - golden.put("$1.isDirectory()", 2); - golden.put("new ImageIcon($1)", 1); - - assertEquals(golden, actual); - } - - public void testPatternEncodingAndIdentifiers() throws Exception { - String text = "package test; public class Test { }"; - - prepareTest("test/Test.java", text); - - BulkPattern bp = createSearch().create(info, new AtomicBoolean(), "$0.isDirectory()"); - - assertEquals(Arrays.asList(new HashSet(Arrays.asList("isDirectory"))), bp.getIdentifiers()); - //TODO: the actual code for kinds differs for NFABased search and REBased search: -// assertEquals(Arrays.asList(new HashSet(Arrays.asList(Kind.METHOD_INVOCATION.name()))), bp.getKinds()); - } - - public void testModifiersMultiVariable() throws Exception { - String code = "package test;\n" + - "public class Test {\n" + - " @Deprecated @Override public Test test;\n" + - "}\n"; - - performTest(code, - Collections.singletonMap("$mods$ @Deprecated public $type $name = $init$;", Arrays.asList("@Deprecated @Override public Test test;")), - Collections.emptyList()); - } - - protected abstract BulkSearch createSearch(); - - private void performMatchesTest(String text, List patterns, boolean golden) throws Exception { - prepareTest("test/Test.java", text); - - BulkPattern p = createSearch().create(info, new AtomicBoolean(), patterns); - - boolean result = createSearch().matches(info, new AtomicBoolean(), new TreePath(info.getCompilationUnit()), p); - - assertEquals(golden, result); - } - - private void performTest(String text, Map> containedPatterns, Collection notContainedPatterns) throws Exception { - prepareTest("test/Test.java", text); - - List patterns = new LinkedList(); - - patterns.addAll(containedPatterns.keySet()); - patterns.addAll(notContainedPatterns); - - long s1 = System.currentTimeMillis(); - BulkPattern p = createSearch().create(info, new AtomicBoolean(), patterns); - long e1 = System.currentTimeMillis(); - -// System.err.println("create: " + (e1 - s1)); - - long s2 = System.currentTimeMillis(); - Map> result = createSearch().match(info, new AtomicBoolean(), new TreePath(info.getCompilationUnit()), p); - long e2 = System.currentTimeMillis(); - -// System.err.println("match: " + (e2 - s2)); - - assertTrue(result.toString(), result.keySet().containsAll(containedPatterns.keySet())); - - for (Entry> e : result.entrySet()) { - List actual = new LinkedList(); - - for (TreePath tp : e.getValue()) { - assertNotNull(TreePathHandle.create(tp, info).resolve(info)); - - int start = (int) info.getTrees().getSourcePositions().getStartPosition(info.getCompilationUnit(), tp.getLeaf()); - int end = (int) info.getTrees().getSourcePositions().getEndPosition(info.getCompilationUnit(), tp.getLeaf()); - - actual.add(info.getText().substring(start, end)); - } - - assertEquals(e.getKey(), containedPatterns.get(e.getKey()), actual); - } - - - Set none = new HashSet(result.keySet()); - - none.retainAll(notContainedPatterns); - - assertTrue(none.isEmpty()); - - if (!verifyIndexingData()) - return ; - - //ensure the returned identifiers/treeKinds are correct: - ByteArrayOutputStream data = new ByteArrayOutputStream(); - EncodingContext ec = new EncodingContext(data, false); - - createSearch().encode(info.getCompilationUnit(), ec, new AtomicBoolean()); - - for (int i = 0; i < containedPatterns.size(); i++) { - assertTrue("expected: " + p.getIdentifiers().get(i) + ", but exist only: " + ec.getIdentifiers(), ec.getIdentifiers().containsAll(p.getIdentifiers().get(i))); - - for (List phrase : p.getRequiredContent().get(i)) { - assertTrue("expected: " + phrase + ", but exist only: " + ec.getContent() + "(all phrases: " + p.getRequiredContent().get(i) + ")", Collections.indexOfSubList(ec.getContent(), phrase) != (-1)); - } - } - - data.close(); - assertEquals(!containedPatterns.isEmpty(), createSearch().matches(new ByteArrayInputStream(data.toByteArray()), new AtomicBoolean(), p)); - } - - private void prepareTest(String fileName, String code) throws Exception { - clearWorkDir(); - - FileUtil.refreshFor(File.listRoots()); - - FileObject workFO = FileUtil.toFileObject(getWorkDir()); - - assertNotNull(workFO); - - workFO.refresh(); - - sourceRoot = workFO.createFolder("src"); - FileObject buildRoot = workFO.createFolder("build"); - FileObject cache = workFO.createFolder("cache"); - - FileObject data = FileUtil.createData(sourceRoot, fileName); - File dataFile = FileUtil.toFile(data); - - assertNotNull(dataFile); - - TestUtilities.copyStringToFile(dataFile, code); - - SourceUtilsTestUtil.prepareTest(sourceRoot, buildRoot, cache); - - DataObject od = DataObject.find(data); - EditorCookie ec = od.getLookup().lookup(EditorCookie.class); - - assertNotNull(ec); - - doc = ec.openDocument(); - doc.putProperty(Language.class, JavaTokenId.language()); - - JavaSource js = JavaSource.forFileObject(data); - - assertNotNull(js); - - info = SourceUtilsTestUtil.getCompilationInfo(js, Phase.RESOLVED); - - assertNotNull(info); - } - - private FileObject sourceRoot; - private CompilationInfo info; - private Document doc; - - protected boolean verifyIndexingData() { - return true; - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/CopyFinderBasedBulkSearchTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/CopyFinderBasedBulkSearchTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,99 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl.pm; - -/** - * - * @author lahvac - */ -public class CopyFinderBasedBulkSearchTest extends BulkSearchTestPerformer { - - public CopyFinderBasedBulkSearchTest(String name) { - super(name); - } - - @Override - protected BulkSearch createSearch() { - return new CopyFinderBasedBulkSearch(); - } - - @Override - protected boolean verifyIndexingData() { - return false; - } - - @Override - public void testSerialization() throws Exception { - //XXX - } - - @Override - public void testFrequencies() throws Exception { - //XXX: serialization is a prerequisite - } - - @Override - public void testPatternEncodingAndIdentifiers() throws Exception { - //XXX - } - - @Override - public void testNoExponentialTimeComplexity() throws Exception { - //XXX - } - - @Override - public void testCheckIdentifiers2() throws Exception { - //not critical, only improves performance on vast amounts of sources, - //and NFA based search is used in such case anyway. - //XXX - } - - @Override - public void testCheckIdentifiers3() throws Exception { - //not critical, only improves performance on vast amounts of sources, - //and NFA based search is used in such case anyway. - //XXX - } - -} \ No newline at end of file diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/NFABasedBulkSearchTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/NFABasedBulkSearchTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl.pm; - -/** - * - * @author lahvac - */ -public class NFABasedBulkSearchTest extends BulkSearchTestPerformer { - - public NFABasedBulkSearchTest(String name) { - super(name); - } - -// public static TestSuite suite() { -// NbTestSuite r = new NbTestSuite(); -// -// r.addTest(new NFABasedBulkSearchTest("testField1")); -// r.addTest(new NFABasedBulkSearchTest("testField2")); -// -// return r; -// } - - @Override - protected BulkSearch createSearch() { - return new NFABasedBulkSearch(); - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/PatternCompilerTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/PatternCompilerTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,203 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.java.hints.spiimpl.pm; - -import com.sun.source.tree.Tree; -import com.sun.source.util.SourcePositions; -import com.sun.source.util.TreePath; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.atomic.AtomicBoolean; -import org.netbeans.modules.java.hints.spiimpl.TestBase; -import org.netbeans.api.java.source.matching.Matcher; -import org.netbeans.api.java.source.matching.Occurrence; -import org.openide.util.Pair; - -/** - * - * @author Jan Lahoda - */ -public class PatternCompilerTest extends TestBase { - - public PatternCompilerTest(String name) { - super(name); - } - - public void testSimple1() throws Exception { - performVariablesTest("package test; public class Test {public void test() {int i = |1 + 2|;}}", "$1+$2", - Pair.of("$1", "1"), - Pair.of("$2", "2")); - } - - public void testTyped1() throws Exception { - performVariablesTest("package test; public class Test {public void test() {|String.valueOf(\"t\")|;}}", "String.valueOf($1{String})", - Pair.of("$1", "\"t\"")); - } - -// public void testTyped2() throws Exception { -// performVariablesTest("package test; public class Test {public void test() {|String.valueOf(\"t\")|;}}", "$2{java.lang.String}.valueOf($1{String})", -// new Pair("$1", "\"t\""), -// new Pair("$2", "String")); -// } - - public void testTyped3() throws Exception { - performVariablesTest("package test; public class Test {public void test(String str) {|str.valueOf(\"t\")|;}}", "String.valueOf($1{String})", - Pair.of("$1", "\"t\"")); - } - - public void testTyped4() throws Exception { - performVariablesTest("package test; public class Test {public void test() {|Integer.bitCount(1)|;}}", "$2{java.lang.String}.valueOf($1{String})", - (Pair[]) null); - } - - public void testTyped5() throws Exception { - performVariablesTest("package test; public class Test {public void test() {java.io.File f = null; |f.toURI().toURL()|;}}", "$1{java.io.File}.toURL()", - (Pair[]) null); - } - - public void testTypedPrimitiveType() throws Exception { - performVariablesTest("package test; public class Test {public void test(int i) {|test(1)|;}}", "$0{test.Test}.test($1{int})", - Pair.of("$1", "1")); - } - - public void testMemberSelectVSIdentifier() throws Exception { - performVariablesTest("package test; public class Test {void test1() {} void test2() {|test1()|;}}", "$1{test.Test}.test1()", - new Pair[0]); - } - - public void testSubClass() throws Exception { - performVariablesTest("package test; public class Test {void test() {String s = null; |s.toString()|;}}", "$1{java.lang.CharSequence}.toString()", - Pair.of("$1", "s")); - } - - public void testEquality1() throws Exception { - performVariablesTest("package test; public class Test {void test() {|test()|;}}", "$1{test.Test}.test()", - new Pair[0]); - } - - public void testEquality2() throws Exception { - performVariablesTest("package test; public class Test {void test() {String s = null; |String.valueOf(1).charAt(0)|;}}", "$1{java.lang.String}.charAt(0)", - Pair.of("$1", "String.valueOf(1)")); - } - - public void testEquality3() throws Exception { - performVariablesTest("package test; public class Test {void test() {String s = null; |s.charAt(0)|;}}", "java.lang.String.valueOf(1).charAt(0)", - (Pair[]) null); - } - - public void testType1() throws Exception { - performVariablesTest("package test; public class Test {void test() {|String| s;}}", "java.lang.String", - new Pair[0]); - } - - public void testStatements1() throws Exception { - performVariablesTest("package test; public class Test {void test() {|assert true : \"\";|}}", "assert $1{boolean} : $2{java.lang.Object};", - new Pair[0]); - } - - protected void performVariablesTest(String code, String pattern, Pair... duplicates) throws Exception { - String[] split = code.split("\\|"); - - assertEquals(Arrays.toString(split), 3, split.length); - - int start = split[0].length(); - int end = start + split[1].length(); - - code = split[0] + split[1] + split[2]; - - prepareTest("test/Test.java", code); - - TreePath tp = info.getTreeUtilities().pathFor((start + end) / 2); - - while (tp != null) { - Tree t = tp.getLeaf(); - SourcePositions sp = info.getTrees().getSourcePositions(); - - if ( start == sp.getStartPosition(info.getCompilationUnit(), t) - && end == sp.getEndPosition(info.getCompilationUnit(), t)) { - break; - } - - tp = tp.getParentPath(); - } - - assertNotNull(tp); - - //XXX: - Iterator vars = Matcher.create(info).setCancel(new AtomicBoolean()).setSearchRoot(tp).setTreeTopSearch().match(PatternCompilerUtilities.compile(info, pattern)).iterator(); - - if (duplicates == null) { - assertFalse(vars.hasNext()); - return ; - } - - assertNotNull(vars); - assertTrue(vars.hasNext()); - - Map actual = new HashMap(); - - for (Entry e : vars.next().getVariables().entrySet()) { - int[] span = new int[] { - (int) info.getTrees().getSourcePositions().getStartPosition(info.getCompilationUnit(), e.getValue().getLeaf()), - (int) info.getTrees().getSourcePositions().getEndPosition(info.getCompilationUnit(), e.getValue().getLeaf()) - }; - - actual.put(e.getKey(), info.getText().substring(span[0], span[1])); - } - - assertFalse(vars.hasNext()); - - for (Pair dup : duplicates) { - String span = actual.remove(dup.first()); - - if (span == null) { - fail(dup.first()); - } - assertEquals(dup.first()+ ":" + span, span, dup.second()); - } - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/PatternCompilerUtilities.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/PatternCompilerUtilities.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,88 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2011 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl.pm; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.regex.Matcher; -import javax.lang.model.type.TypeMirror; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.modules.java.hints.spiimpl.pm.PatternCompiler; -import org.netbeans.api.java.source.matching.Pattern; -import org.netbeans.modules.java.hints.spiimpl.Hacks; - -/** - * - * @author lahvac - */ -public class PatternCompilerUtilities { - - public static Pattern compile(CompilationInfo info, String pattern) { - Map constraints = new HashMap(); - pattern = parseOutTypesFromPattern(info, pattern, constraints); - - return PatternCompiler.compile(info, pattern, constraints, Collections.emptyList()); - } - - public static String parseOutTypesFromPattern(CompilationInfo info, String pattern, Map variablesToTypes) { - java.util.regex.Pattern p = java.util.regex.Pattern.compile("(\\$[0-9])(\\{([^}]*)\\})?"); - StringBuilder filtered = new StringBuilder(); - Matcher m = p.matcher(pattern); - int i = 0; - - while (m.find()) { - filtered.append(pattern.substring(i, m.start())); - i = m.end(); - - String var = m.group(1); - String type = m.group(3); - - filtered.append(var); - variablesToTypes.put(var, type != null ? Hacks.parseFQNType(info, type) : null); - } - - filtered.append(pattern.substring(i)); - - return filtered.toString(); - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/processor/JavaHintsAnnotationProcessorTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/processor/JavaHintsAnnotationProcessorTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,149 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2012 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2012 Sun Microsystems, Inc. - */ -package org.netbeans.modules.java.hints.spiimpl.processor; - -import java.io.ByteArrayOutputStream; -import java.io.File; -import org.netbeans.junit.NbTestCase; -import org.openide.util.test.AnnotationProcessorTestUtils; -import org.openide.util.test.TestFileUtils; - -/** - * - * @author lahvac - */ -public class JavaHintsAnnotationProcessorTest extends NbTestCase { - - public JavaHintsAnnotationProcessorTest(String name) { - super(name); - } - - public void testErrors1() throws Exception { - File src = new File(getWorkDir(), "src"); - File dest = new File(getWorkDir(), "classes"); - AnnotationProcessorTestUtils.makeSource(src, "p.H", - "import org.netbeans.spi.java.hints.*;\n", - "import org.netbeans.spi.editor.hints.*;\n", - "@Hint(displayName=\"\", description=\"\", category=\"general\")\n", - "public class H {\n", - " @TriggerPattern(\"$1.$2\")\n", - " public static String h1(HintContext ctx) { return null;}\n", - " @TriggerPattern(\"$1.$2.$3\")\n", - " public static ErrorDescription h2() { return null;}\n", - " @TriggerPatterns({@TriggerPattern(\"$1.$2.$3.$4\")})\n", - " private ErrorDescription h3(HintContext ctx) { return null;}\n", - " @TriggerPattern(value=\"$1.isEmpty()\", constraints=@ConstraintVariableType(variable=\"$unknown\", type=\"java.lang.String\"))\n", - " public static ErrorDescription h4(HintContext ctx) { return null;}\n", - "}\n"); - TestFileUtils.writeFile(new File(src, "p/Bundle.properties"), ""); - ByteArrayOutputStream err = new ByteArrayOutputStream(); - assertFalse(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, err)); - String errors = err.toString(); - assertTrue(errors.contains("error: The return type must be either org.netbeans.spi.editor.hints.ErrorDescription or java.util.List")); - assertTrue(errors.contains("error: The method must have exactly one parameter of type org.netbeans.spi.java.hints.HintContext")); - assertTrue(errors.contains("error: The method must be static")); - assertTrue(errors.contains("warning: Variable $unknown not used in the pattern")); - } - - public void testErrors2() throws Exception { - File src = new File(getWorkDir(), "src"); - File dest = new File(getWorkDir(), "classes"); - AnnotationProcessorTestUtils.makeSource(src, "p.H", - "import org.netbeans.spi.java.hints.*;\n", - "import org.netbeans.spi.editor.hints.*;\n", - "import java.util.*;\n", - "@Hint(displayName=\"#DN_p.H\", description=\"#DESC_p.H\", category=\"general\")\n", - "public class H {\n", - " @TriggerPattern(\"$1.$2.$3\")\n", - " public static List hint(HintContext ctx) { return null;}\n", - "}\n"); - TestFileUtils.writeFile(new File(src, "p/Bundle.properties"), "DN_p.H=DN_p.H\nDESC_p.H=DESC_p.H\n"); - ByteArrayOutputStream err = new ByteArrayOutputStream(); - assertTrue(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, err)); - } - - public void testCustomizerProvider() throws Exception { - File src = new File(getWorkDir(), "src"); - File dest = new File(getWorkDir(), "classes"); - AnnotationProcessorTestUtils.makeSource(src, "p.H", - "import org.netbeans.spi.java.hints.*;\n", - "import org.netbeans.spi.editor.hints.*;\n", - "import java.util.*;\n", - "import java.util.prefs.*;\n", - "import javax.swing.*;\n", - "@Hint(displayName=\"dn\", description=\"desc\", category=\"general\", customizerProvider=H.Customizer.class)\n", - "public class H {\n", - " @TriggerPattern(\"$1.$2.$3\")\n", - " public static List hint(HintContext ctx) { return null;}\n", - " static final class Customizer implements CustomizerProvider {\n", - " @Override public JComponent getCustomizer(Preferences prefs) {\n", - " return new JPanel();\n", - " }\n", - " }\n", - "}\n"); - TestFileUtils.writeFile(new File(src, "p/Bundle.properties"), "DN_p.H=DN_p.H\nDESC_p.H=DESC_p.H\n"); - ByteArrayOutputStream err = new ByteArrayOutputStream(); - assertFalse(AnnotationProcessorTestUtils.runJavac(src, null, dest, null, err)); - String errors = err.toString(); - assertTrue(errors.contains("error: Customizer provider must be public")); - assertTrue(errors.contains("error: Customizer provider must provide a public default constructor")); - } - - public void testErrorsMessagesOnMethod() throws Exception { - File src = new File(getWorkDir(), "src"); - File dest = new File(getWorkDir(), "classes"); - AnnotationProcessorTestUtils.makeSource(src, "p.H", - "import org.netbeans.spi.java.hints.*;\n", - "import org.netbeans.spi.editor.hints.*;\n", - "import org.openide.util.NbBundle.Messages;\n", - "import java.util.*;\n", - "public class H {\n", - " @Hint(displayName=\"#DN_p.H\", description=\"#DESC_p.H\", category=\"general\")\n", - " @TriggerPattern(\"$1.$2.$3\")\n", - " @Messages({\"DN_p.H=1\", \"DESC_p.H=2\"})\n", - " public static List hint(HintContext ctx) { return null;}\n", - "}\n"); - ByteArrayOutputStream err = new ByteArrayOutputStream(); - boolean result = AnnotationProcessorTestUtils.runJavac(src, null, dest, null, err); - assertTrue(err.toString(), result); - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1169 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.spi.java.hints; - -import org.netbeans.modules.java.hints.providers.spi.HintDescriptionFactory; -import org.netbeans.modules.java.hints.providers.spi.HintDescription; -import com.sun.source.tree.ClassTree; -import com.sun.source.tree.ExpressionTree; -import com.sun.source.tree.VariableTree; -import com.sun.source.util.TreePath; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.ElementFilter; -import org.netbeans.modules.java.hints.spiimpl.TestBase; -import org.netbeans.modules.java.hints.spiimpl.hints.HintsInvoker; -import org.netbeans.modules.java.hints.providers.spi.Trigger.PatternDescription; -import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings; -import org.netbeans.modules.java.hints.spiimpl.pm.PatternCompilerUtilities; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.editor.hints.Fix; -import org.openide.LifecycleManager; -import org.openide.modules.SpecificationVersion; -import org.openide.util.MapFormat; - -/** - * - * @author Jan Lahoda - */ -public class JavaFixUtilitiesTest extends TestBase { - - public JavaFixUtilitiesTest(String name) { - super(name); - } - - public void testSimple() throws Exception { - SpecificationVersion v = computeSpecVersion("/**\n" + - " * @since 1.5\n" + - " */\n"); - - assertEquals(0, v.compareTo(new SpecificationVersion("1.5"))); - } - - public void testSimpleDate() throws Exception { - SpecificationVersion v = computeSpecVersion("/**\n" + - " * @since 1.5 (16 May 2005)\n" + - " */\n"); - - assertEquals(0, v.compareTo(new SpecificationVersion("1.5"))); - } - - public void testLongText() throws Exception { - SpecificationVersion v = computeSpecVersion("/**\n" + - " * @since 1.123.2.1 - branch propsheet_issue_29447\n" + - " */\n"); - - assertEquals(0, v.compareTo(new SpecificationVersion("1.123.2.1"))); - } - - public void testModuleName() throws Exception { - SpecificationVersion v = computeSpecVersion("/**\n" + - " * @since org.openide.filesystems 7.15\n" + - " */\n"); - - assertEquals(0, v.compareTo(new SpecificationVersion("7.15"))); - } - - public void testModuleNameMajor() throws Exception { - SpecificationVersion v = computeSpecVersion("/**\n" + - " * @since org.openide/1 4.42\n" + - " */\n"); - - assertEquals(0, v.compareTo(new SpecificationVersion("4.42"))); - } - - public void testEnd() throws Exception { - SpecificationVersion v = computeSpecVersion("/**\n" + - " * @since 1.5 */\n"); - - assertEquals(0, v.compareTo(new SpecificationVersion("1.5"))); - } - - public void testOpenAPI() throws Exception { - SpecificationVersion v = computeSpecVersion("/**\n" + - " * @since OpenAPI version 2.12" + - " */\n"); - - assertEquals(0, v.compareTo(new SpecificationVersion("2.12"))); - - } - - private SpecificationVersion computeSpecVersion(String javadoc) throws Exception { - prepareTest("test/Test.java", - "package test;\n" + - "public class Test {\n" + - javadoc + - " public void test() {\n" + - " }\n" + - "}\n"); - - TypeElement te = info.getElements().getTypeElement("test.Test"); - ExecutableElement method = ElementFilter.methodsIn(te.getEnclosedElements()).iterator().next(); - - return JavaFixUtilities.computeSpecVersion(info, method); - } - - public void testArithmetic1() throws Exception { - performArithmeticTest("1 + 2", "3"); - performArithmeticTest("1f + 2", "3.0F"); - performArithmeticTest("1 + 2f", "3.0F"); - performArithmeticTest("1.0 + 2f", "3.0"); - performArithmeticTest("1 + 2.0", "3.0"); - performArithmeticTest("1L + 2", "3L"); - } - - public void testArithmetic2() throws Exception { - performArithmeticTest("1 * 2", "2"); - performArithmeticTest("1f * 2", "2.0F"); - performArithmeticTest("1 * 2f", "2.0F"); - performArithmeticTest("1.0 * 2f", "2.0"); - performArithmeticTest("1 * 2.0", "2.0"); - performArithmeticTest("1L * 2", "2L"); - } - - public void testArithmetic3() throws Exception { - performArithmeticTest("4 / 2", "2"); - performArithmeticTest("4f / 2", "2.0F"); - performArithmeticTest("4 / 2f", "2.0F"); - performArithmeticTest("4.0 / 2f", "2.0"); - performArithmeticTest("4 / 2.0", "2.0"); - performArithmeticTest("4L / 2", "2L"); - } - - public void testArithmetic4() throws Exception { - performArithmeticTest("5 % 2", "1"); - performArithmeticTest("5f % 2", "1.0F"); - performArithmeticTest("5 % 2f", "1.0F"); - performArithmeticTest("5.0 % 2f", "1.0"); - performArithmeticTest("5 % 2.0", "1.0"); - performArithmeticTest("5L % 2", "1L"); - } - - public void testArithmetic5() throws Exception { - performArithmeticTest("5 - 2", "3"); - performArithmeticTest("5f - 2", "3.0F"); - performArithmeticTest("5 - 2f", "3.0F"); - performArithmeticTest("5.0 - 2f", "3.0"); - performArithmeticTest("5 - 2.0", "3.0"); - performArithmeticTest("5L - 2", "3L"); - } - - public void testArithmetic6() throws Exception { - performArithmeticTest("5 | 2", "7"); - performArithmeticTest("5L | 2", "7L"); - performArithmeticTest("5 | 2L", "7L"); - } - - public void testArithmetic7() throws Exception { - performArithmeticTest("5 & 4", "4"); - performArithmeticTest("5L & 4", "4L"); - performArithmeticTest("5 & 4L", "4L"); - } - - public void testArithmetic8() throws Exception { - performArithmeticTest("5 ^ 4", "1"); - performArithmeticTest("5L ^ 4", "1L"); - performArithmeticTest("5 ^ 4L", "1L"); - } - - public void testArithmetic9() throws Exception { - performArithmeticTest("5 << 2", "20"); - performArithmeticTest("5L << 2", "20L"); - performArithmeticTest("5 << 2L", "20L"); - } - - public void testArithmeticA() throws Exception { - performArithmeticTest("-20 >> 2", "-5"); - performArithmeticTest("-20L >> 2", "-5L"); - performArithmeticTest("-20 >> 2L", "-5L"); - } - - public void testArithmeticB() throws Exception { - performArithmeticTest("-20 >>> 2", "1073741819"); - } - - public void testArithmeticC() throws Exception { - performArithmeticTest("0 + -20", "-20"); - performArithmeticTest("0 + +20", "20"); - } - - public void testArithmeticComplex() throws Exception { - performArithmeticTest("1 + 2 * 4 - 5", "4"); - performArithmeticTest("1f + 2 * 4.0 - 5", "4.0"); - performArithmeticTest("1L + 2 * 4 - 5", "4L"); - } - - private static final String ARITHMETIC = "public class Test { private Object o = __VAL__; }"; - private void performArithmeticTest(String orig, String nue) throws Exception { - String code = replace("0"); - - prepareTest("Test.java", code); - ClassTree clazz = (ClassTree) info.getCompilationUnit().getTypeDecls().get(0); - VariableTree variable = (VariableTree) clazz.getMembers().get(1); - ExpressionTree init = variable.getInitializer(); - TreePath tp = new TreePath(new TreePath(new TreePath(new TreePath(info.getCompilationUnit()), clazz), variable), init); - Fix fix = JavaFixUtilities.rewriteFix(info, "A", tp, orig, Collections.emptyMap(), Collections.>emptyMap(), Collections.emptyMap(), Collections.emptyMap(), Collections.emptyMap()); - fix.implement(); - - String golden = replace(nue); - String out = doc.getText(0, doc.getLength()); - - assertEquals(golden, out); - - LifecycleManager.getDefault().saveAll(); - } - - private static String replace(String val) { - MapFormat f = new MapFormat(Collections.singletonMap("VAL", val)); - - f.setLeftBrace("__"); - f.setRightBrace("__"); - - return f.format(ARITHMETIC); - } - - public void testRewriteWithParenthesis1() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " int i = new String(\"a\" + \"b\").length();\n" + - "}\n", - "new String($1)=>$1", - "package test;\n" + - "public class Test {\n" + - " int i = (\"a\" + \"b\").length();\n" + - "}\n"); - } - - public void testRewriteWithParenthesis2() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " int i = Integer.valueOf(1 + 2) * 3;\n" + - "}\n", - "Integer.valueOf($1)=>$1", - "package test;\n" + - "public class Test {\n" + - " int i = (1 + 2) * 3;\n" + - "}\n"); - } - - public void testRewriteWithoutParenthesis1() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " int i = new String(\"a\" + \"b\").length();\n" + - "}\n", - "new String($1)=>java.lang.String.format(\"%s%s\", $1, \"\")", - "package test;\n" + - "public class Test {\n" + - " int i = String.format(\"%s%s\", \"a\" + \"b\", \"\").length();\n" + - "}\n"); - } - - public void testRewriteWithoutParenthesis2() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " String s = (\"a\" + \"b\").intern();\n" + - "}\n", - "($1).intern()=>$1", - "package test;\n" + - "public class Test {\n" + - " String s = \"a\" + \"b\";\n" + - "}\n"); - } - - public void testRewriteWithoutParenthesis3() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " int i = Integer.valueOf(1 + 2) + 3;\n" + - "}\n", - "Integer.valueOf($1)=>$1", - "package test;\n" + - "public class Test {\n" + - " int i = 1 + 2 + 3;\n" + - "}\n"); - } - - public void testRewriteWithoutParenthesis4() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " int i = Integer.valueOf(1 * 2) + 3;\n" + - "}\n", - "Integer.valueOf($1)=>$1", - "package test;\n" + - "public class Test {\n" + - " int i = 1 * 2 + 3;\n" + - "}\n"); - } - - public void testRewriteWithoutParenthesis5() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " int i = new Integer(1 * 2).hashCode();\n" + - "}\n", - "$1.hashCode()=>$1.hashCode()", - "package test;\n" + - "public class Test {\n" + - " int i = new Integer(1 * 2).hashCode();\n" + - "}\n"); - } - - public void testRewriteWithoutParenthesis6() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " {\n" + - " System.err.println(\"a\" + 1);\n" + - " }\n" + - "}\n", - "System.err.println($t)=>D.println($t)", - "package test;\n" + - "public class Test {\n" + - " {\n" + - " D.println(\"a\" + 1);\n" + - " }\n" + - "}\n"); - } - - public void testRewriteWithoutParenthesis7() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " {\n" + - " new String(\"a\" + 1);\n" + - " }\n" + - "}\n", - "new String($t)=>new D($t)", - "package test;\n" + - "public class Test {\n" + - " {\n" + - " new D(\"a\" + 1);\n" + - " }\n" + - "}\n"); - } - - public void testTopLevelRewriteWithoutParenthesis1() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " int i = (1 + 2) * 2;\n" + - "}\n", - "$1 + $2=>3", - "package test;\n" + - "public class Test {\n" + - " int i = 3 * 2;\n" + - "}\n"); - } - - public void testTopLevelRewriteKeepParenthesis1() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " int i = (1 * 2) + 2;\n" + - "}\n", - "$1 * $2=>2", - "package test;\n" + - "public class Test {\n" + - " int i = (2) + 2;\n" + - "}\n"); - } - - public void testTopLevelRewriteKeepParenthesis2() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " { if (1 > 2) ; }\n" + - "}\n", - "$1 > $2=>false", - "package test;\n" + - "public class Test {\n" + - " { if (false) ; }\n" + - "}\n"); - } - - public void testRewriteCatchMultiVariable() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " { try { } catch {NullPointerException ex} { } }\n" + - "}\n", - "try { } catch $catches$ => try { new Object(); } catch $catches$", - "package test;\n" + - "public class Test {\n" + - //XXX: whitespaces: - " { try {new Object();\n } catch {NullPointerException ex} { } }\n" + -// " { try { new Object();\n } catch {NullPointerException ex} { } }\n" + - "}\n"); - } - - public void testRewriteCaseMultiVariable() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " { int i = 0; switch (i) {case 0: System.err.println(1); break; case 1: System.err.println(2); break; case 2: System.err.println(3); break; }\n" + - "}\n", - "switch ($v) { case $p$ case 2: $stmts$; } => switch ($v) { case $p$ case 3: $stmts$; }", - "package test;\n" + - "public class Test {\n" + - " { int i = 0; switch (i) {case 0: System.err.println(1); break; case 1: System.err.println(2); break; case 3: System.err.println(3); break; }\n" + - "}\n"); - } - - public void testRewriteMemberSelectVariable() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " { java.io.File f = null; boolean b = f.isDirectory(); }\n" + - "}\n", - "$file.$m() => foo.Bar.$m($file)", - "package test;\n" + - "public class Test {\n" + - " { java.io.File f = null; boolean b = foo.Bar.isDirectory(f); }\n" + - "}\n"); - } - - public void testRewriteIdent2IdentMemberSelectPattern() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " private boolean b; private void t() { boolean c = b; }\n" + - "}\n", - "$0{test.Test}.b => !$0.b", - "package test;\n" + - "public class Test {\n" + - " private boolean b; private void t() { boolean c = !b; }\n" + - "}\n"); - } - - public void testCarefulRewriteInImports() throws Exception { - performRewriteTest("package test;\n" + - "import javax.swing.text.AbstractDocument;\n" + - "public class Test {\n" + - "}\n", - "javax.swing.text.AbstractDocument => javax.swing.text.Document", - "package test;\n" + - "import javax.swing.text.Document;\n" + - "public class Test {\n" + - "}\n"); - } - - public void testRemoveFromParent1() throws Exception { - performRemoveFromParentTest("package test;\n" + - "public class Test {\n" + - " private int I;" + - "}\n", - "$mods$ int $f;", - "package test;\n" + - "public class Test {\n" + - "}\n"); - } - - public void testRemoveFromParent2() throws Exception { - performRemoveFromParentTest("package test;\n" + - "public class Test extends java.util.ArrayList {\n" + - "}\n", - "java.util.ArrayList", - "package test;\n" + - "public class Test {\n" + - "}\n"); - } - - public void testRemoveFromParentExpressionStatement206116() throws Exception { - performRemoveFromParentTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + - " System.err.println();\n" + - " System.err.println(\"a\");\n" + - " }\n" + - "}\n", - "System.err.println()", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + - " System.err.println(\"a\");\n" + - " }\n" + - "}\n"); - } - - public void testUnresolvableTarget() throws Exception { - performRewriteTest("package test;\n" + - "public class Test extends java.util.ArrayList {\n" + - "}\n", - "java.util.ArrayList => Test", - "package test;\n" + - "public class Test extends Test {\n" + - "}\n"); - } - - public void testTryWithResourceTarget() throws Exception { - performRewriteTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + - " InputStream in = null;\n" + - " try {\n" + - " } finally {\n" + - " in.close()\n" + - " }\n" + - " }\n" + - "}\n", - "$type $var = $init; try {} finally {$var.close();} => try ($type $var = $init) {} finally {$var.close();}", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + -// " try (InputStream in = null) {\n" + - //XXX: - " try (final InputStream in = null) {\n" + - " } finally {\n" + - " in.close()\n" + - " }\n" + - " }\n" + - "}\n"); - } - - public void testSingle2MultipleStatements() throws Exception { - performRewriteTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + - " int i = 0;\n" + - " }\n" + - "}\n", - "$type $var = $init; => $type $var; $var = $init;", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + - " int i;\n" + - " i = 0;\n" + - " }\n" + - "}\n"); - } - - public void testSingle2MultipleStatements2() throws Exception { - performRewriteTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + - " while (true)\n" + - " if (true) {\n" + - " System.err.println();\n" + - " }\n" + - " }\n" + - "}\n", - "if (true) $then; => if (true) $then; System.err.println();", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + - " while (true) {\n" + - " if (true) {\n" + - " System.err.println();\n" + - " }\n" + - " System.err.println();\n" + - " }\n" + - " }\n" + - "}\n"); - } - - public void testMultipleStatementsWrapComments1() throws Exception { - performRewriteTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + - " if (1 == 1) {\n" + - " System.err.println();\n" + - " System.err.println(\"a\");\n" + - " \n" + - " \n" + - " //C\n" + - " System.err.println(\"b\");\n" + - " }\n" + - " }\n" + - "}\n", - "if ($cond) { System.err.println(); $stmts$;} => while ($cond) { $stmts$;}", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + - " while (1 == 1) {\n" + - " System.err.println(\"a\");\n" + - " \n" + - " \n" + - " //C\n" + - " System.err.println(\"b\");\n" + - " }\n" + - " }\n" + - "}\n"); - } - - public void testMultipleStatementsWrapComments2() throws Exception { - performRewriteTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + - " if (1 == 1) {\n" + - " System.err.println();\n" + - " System.err.println(\"a\");\n" + - " \n" + - " \n" + - " //C\n" + - " System.err.println(\"b\");\n" + - " }\n" + - " }\n" + - "}\n", - "if ($cond) { $stmts$;} => while ($cond) { $stmts$;}", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + - " while (1 == 1) {\n" + - " System.err.println();\n" + - " System.err.println(\"a\");\n" + - " \n" + - " \n" + - " //C\n" + - " System.err.println(\"b\");\n" + - " }\n" + - " }\n" + - "}\n"); - } - - public void testReplaceTypeParameters1() throws Exception { - performRewriteTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() {\n" + - " }\n" + - "}\n", - "$mods$ <$O, $T> $ret $name() { $body$; } => $mods$ <$T, $O> $ret $name() { $body$; }", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() {\n" + - " }\n" + - "}\n"); - } - - public void testReplaceTypeParameters2() throws Exception { - performRewriteTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() {\n" + - " }\n" + - "}\n", - "$mods$ <$T$> $ret $name() { $body$; } => $mods$ $ret $name() { $body$; }", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() {\n" + - " }\n" + - "}\n"); - } - - public void testAdd2Modifiers() throws Exception { - performRewriteTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " void t() {\n" + - " }\n" + - "}\n", - "$mods$ $ret $name() { $body$; } => $mods$ @java.lang.Deprecated private $ret $name() { $body$; }", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " @Deprecated\n" + - " private void t() {\n" + - " }\n" + - "}\n"); - } - - public void testReplaceInModifiers() throws Exception { - performRewriteTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " public @Override void t() {\n" + - " }\n" + - "}\n", - "$mods$ public @Override $ret $name() { $body$; } => $mods$ private @Deprecated $ret $name() { $body$; }", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private @Deprecated void t() {\n" + - " }\n" + - "}\n"); - } - - public void testKeepInModifiers() throws Exception { - performRewriteTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " public @Override void t() {\n" + - " }\n" + - "}\n", - "$mods$ public @Override $ret $name() { $body$; } => $mods$ public @Override $ret $name() { $body$; }", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " public @Override void t() {\n" + - " }\n" + - "}\n"); - } - - public void testRemoveInModifiers() throws Exception { - performRewriteTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " public static @Deprecated @Override void t() {\n" + - " }\n" + - "}\n", - "$mods$ public @Override $ret $name() { $body$; } => $mods$ $ret $name() { $body$; }", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " static @Deprecated void t() {\n" + - " }\n" + - "}\n"); - } - - public void testRewriteMethodParametersWildcard() throws Exception { - performRewriteTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " public static void t() {\n" + - " }\n" + - "}\n", - "$mods$ void $name($args$) { $body$; } => $mods$ int $name($args$) { $body$; }", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " public static int t() {\n" + - " }\n" + - "}\n"); - } - - public void testRewriteClass() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - "}\n", - "$mods$ class $name<$tp$> extends $e$ implements $i$ { $members$; } => $mods$ @java.lang.Deprecated class $name<$tp$> extends $e$ implements $i$ { $members$; }", - "package test;\n" + - "@Deprecated\n" + - "public class Test {\n" + - "}\n"); - } - - public void testOptionalVariableInitializer1() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " private int I;\n" + - "}\n", - "$mods$ int $name = $init$; => $mods$ long $name = $init$;", - "package test;\n" + - "public class Test {\n" + - " private long I;\n" + - "}\n"); - } - - public void testOptionalVariableInitializer2() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " private int I = 1;\n" + - "}\n", - "$mods$ int $name = $init$; => $mods$ long $name = $init$;", - "package test;\n" + - "public class Test {\n" + - " private long I = 1;\n" + - "}\n"); - } - - public void testOptionalElse1() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " {\n" + - " if (true) System.err.println(\"a\");\n" + - " }\n" + - "}\n", - "if (true) $then else $else$; => if (false) $then else $else$;", - "package test;\n" + - "public class Test {\n" + - " {\n" + - " if (false) System.err.println(\"a\");\n" + - " }\n" + - "}\n"); - } - - public void testOptionalElse2() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " {\n" + - " if (true) System.err.println(\"a\");\n" + - " else System.err.println(\"b\");\n" + - " }\n" + - "}\n", - "if (true) $then else $else$; => if (false) $then else $else$;", - "package test;\n" + - "public class Test {\n" + - " {\n" + - " if (false) System.err.println(\"a\");\n" + - " else System.err.println(\"b\");\n" + - " }\n" + - "}\n"); - } - - public void testMultiNewArray() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " private static void t(Object... obj) {\n" + - " Test.t(1);\n" + - " }\n" + - "}\n", - "test.Test.t($args$) => test.Test.t(new Object[] {$args$})", - "package test;\n" + - "public class Test {\n" + - " private static void t(Object... obj) {\n" + - " Test.t(new Object[]{1});\n" + - " }\n" + - "}\n"); - } - - public void testFakeBlock2FakeBlock191283() throws Exception { - performRewriteTest("package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + - " System.err.println(1);\n" + - " lock();\n" + - " System.err.println(2);\n" + - " unlock();\n" + - " System.err.println(3);\n" + - " }\n" + - " private static void lock() {}\n" + - " private static void unlock() {}\n" + - "}\n", - "test.Test.lock(); $i$; test.Test.unlock(); => lock(); try { $i$; } finally { unlock(); }", - "package test;\n" + - "import java.io.InputStream;\n" + - "public class Test {\n" + - " private void t() throws Exception {\n" + - " System.err.println(1);\n" + - " lock();\n" + - " try {\n" + - " System.err.println(2);\n" + - " } finally {\n" + - " unlock();\n" + - " }\n" + - " System.err.println(3);\n" + - " }\n" + - " private static void lock() {}\n" + - " private static void unlock() {}\n" + - "}\n"); - } - - public void testOptimizeNegExpression() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " private static void t(int i) {\n" + - " if (i == 0) {\n" + - " System.err.println(1);\n" + - " } else {\n" + - " System.err.println(2);\n" + - " }\n" + - " }\n" + - "}\n", - "if ($cond) $then; else $else; => if (!$cond) $else; else $then;", - "package test;\n" + - "public class Test {\n" + - " private static void t(int i) {\n" + - " if (i != 0) {\n" + - " System.err.println(2);\n" + - " } else {\n" + - " System.err.println(1);\n" + - " }\n" + - " }\n" + - "}\n"); - } - - public void testDontOptimizeNegExpression() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " private static void t(int i) {\n" + - " if (!(i == 0)) {\n" + - " System.err.println(1);\n" + - " } else {\n" + - " System.err.println(2);\n" + - " }\n" + - " }\n" + - "}\n", - "if (!$cond) $then; else $else; => if (!$cond) $else; else $then;", - "package test;\n" + - "public class Test {\n" + - " private static void t(int i) {\n" + - " if (!(i == 0)) {\n" + - " System.err.println(2);\n" + - " } else {\n" + - " System.err.println(1);\n" + - " }\n" + - " }\n" + - "}\n"); - } - - public void testCannotOptimizeNegExpression() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " private static void t(String str) {\n" + - " if (str.isEmpty()) {\n" + - " System.err.println(1);\n" + - " } else {\n" + - " System.err.println(2);\n" + - " }\n" + - " }\n" + - "}\n", - "if ($cond) $then; else $else; => if (!$cond) $else; else $then;", - "package test;\n" + - "public class Test {\n" + - " private static void t(String str) {\n" + - " if (!str.isEmpty()) {\n" + - " System.err.println(2);\n" + - " } else {\n" + - " System.err.println(1);\n" + - " }\n" + - " }\n" + - "}\n"); - } - - public void testOptimizeNegExpressionNeg() throws Exception { - performOptimizeNegExpressionTest("!s.isEmpty()", "s.isEmpty()"); - } - - public void testOptimizeNegExpressionParens() throws Exception { - performOptimizeNegExpressionTest("!(a.length == 0)", "a.length == 0"); - } - - public void testOptimizeNegExpressionEquals() throws Exception { - performOptimizeNegExpressionTest("i == 0", "i != 0"); - } - - public void testOptimizeNegExpressionNotEquals() throws Exception { - performOptimizeNegExpressionTest("i != 0", "i == 0"); - } - - public void testOptimizeNegExpressionTrue() throws Exception { - performOptimizeNegExpressionTest("true", "false"); - } - - public void testOptimizeNegExpressionFalse() throws Exception { - performOptimizeNegExpressionTest("false", "true"); - } - - public void testOptimizeNegExpressionDeMorganAnd() throws Exception { - performOptimizeNegExpressionTest("a.length != 0 && true", "a.length == 0 || false"); - } - - public void testOptimizeNegExpressionDeMorganOr() throws Exception { - performOptimizeNegExpressionTest("args.length != 0 || false", "args.length == 0 && true"); - } - - public void testOptimizeNegExpressionLess() throws Exception { - performOptimizeNegExpressionTest("i < 0", "i >= 0"); - } - - public void testOptimizeNegExpressionLessEq() throws Exception { - performOptimizeNegExpressionTest("i <= 0", "i > 0"); - } - - public void testOptimizeNegExpressionGreater() throws Exception { - performOptimizeNegExpressionTest("i > 0", "i <= 0"); - } - - public void testOptimizeNegExpressionGreaterEq() throws Exception { - performOptimizeNegExpressionTest("i >= 0", "i < 0"); - } - - public void testOptimizeNegExpressionAnd() throws Exception { - performOptimizeNegExpressionTest("b1 && b2", "!b1 || !b2"); - } - - public void test229785a() throws Exception { - performOptimizeNegExpressionTest("(a[0] == null && a[1] != null) || (a[0] != null && !a[0].equals(a[1]))", "(a[0] != null || a[1] == null) && (a[0] == null || a[0].equals(a[1]))"); - } - - public void test229785b() throws Exception { - performOptimizeNegExpressionTest("a[0] == null && a[1] != null || a[0] != null && !a[0].equals(a[1])", "(a[0] != null || a[1] == null) && (a[0] == null || a[0].equals(a[1]))"); - } - - private void performOptimizeNegExpressionTest(String origExpr, String newExpr) throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " private static void t(String s, int i, boolean b1, boolean b2, String... a) {\n" + - " if (" + origExpr + ") {\n" + - " System.err.println(1);\n" + - " } else {\n" + - " System.err.println(2);\n" + - " }\n" + - " }\n" + - "}\n", - "if ($cond) $then; else $else; => if (!$cond) $else; else $then;", - "package test;\n" + - "public class Test {\n" + - " private static void t(String s, int i, boolean b1, boolean b2, String... a) {\n" + - " if (" + newExpr + ") {\n" + - " System.err.println(2);\n" + - " } else {\n" + - " System.err.println(1);\n" + - " }\n" + - " }\n" + - "}\n"); - } - - public void testExpression2ExpressionStatementTolerance227429() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " private static void t() {\n" + - " System.err.println(1);\n" + - " }\n" + - "}\n", - "java.lang.System.err.println($args$) => java.lang.System.out.println($args$);", - "package test;\n" + - "public class Test {\n" + - " private static void t() {\n" + - " System.out.println(1);\n" + - " }\n" + - "}\n"); - } - - public void testSplitIfOr() throws Exception { - performRewriteTest("package test;\n" + - "public class Test {\n" + - " private static void t(int i) {\n" + - " if (i == 0 || i == 1) {\n" + - " System.err.println();\n" + - " }\n" + - " }\n" + - "}\n", - "if ($cond1 || $cond2) $then; => if ($cond1) $then; else if ($cond2) $then;", - "package test;\n" + - "public class Test {\n" + - " private static void t(int i) {\n" + - " if (i == 0) {\n" + - " System.err.println();\n" + - " } else if (i == 1) {\n" + - " System.err.println();\n" + - " }\n" + - " }\n" + - "}\n"); - } - - public void testLambdaExpr2Block() throws Exception { - performRewriteTest("package test;\n" + - "import java.util.*;\n" + - "public class Test {\n" + - " public void main(List list) {\n" + - " Collections.sort(list, (l, r) -> l.compareTo(r));\n" + - " }\n" + - "}\n", - "($args$) -> $expr => ($args$) -> { return $expr; }", - "package test;\n" + - "import java.util.*;\n" + - "public class Test {\n" + - " public void main(List list) {\n" + - " Collections.sort(list, (l, r) -> {\n" + - " return l.compareTo(r);\n" + - " });\n" + - " }\n" + - "}\n"); - } - - public void performRewriteTest(String code, String rule, String golden) throws Exception { - prepareTest("test/Test.java", code); - - final String[] split = rule.split("=>"); - assertEquals(2, split.length); - Map variablesToTypesTM = new HashMap(); - String plainRule = PatternCompilerUtilities.parseOutTypesFromPattern(info, split[0], variablesToTypesTM); - Map variablesToTypes = new HashMap(); - for (Entry e : variablesToTypesTM.entrySet()) { - if (e.getValue() == null) continue; - variablesToTypes.put(e.getKey(), e.getValue().toString()); - } - HintDescription hd = HintDescriptionFactory.create() - .setTrigger(PatternDescription.create(plainRule, variablesToTypes)) - .setWorker(new HintDescription.Worker() { - @Override public Collection createErrors(HintContext ctx) { - return Collections.singletonList(ErrorDescriptionFactory.forName(ctx, ctx.getPath(), "", JavaFixUtilities.rewriteFix(ctx, "", ctx.getPath(), split[1]))); - } - }).produce(); - - List computeHints = new HintsInvoker(HintsSettings.getGlobalSettings(), new AtomicBoolean()).computeHints(info, Collections.singleton(hd)); - - assertEquals(computeHints.toString(), 1, computeHints.size()); - - Fix fix = computeHints.get(0).getFixes().getFixes().get(0); - - fix.implement(); - - assertEquals(golden, doc.getText(0, doc.getLength())); - } - - public void performRemoveFromParentTest(String code, String rule, String golden) throws Exception { - prepareTest("test/Test.java", code); - - HintDescription hd = HintDescriptionFactory.create() - .setTrigger(PatternDescription.create(rule, Collections.emptyMap())) - .setWorker(new HintDescription.Worker() { - @Override public Collection createErrors(HintContext ctx) { - return Collections.singletonList(ErrorDescriptionFactory.forName(ctx, ctx.getPath(), "", JavaFixUtilities.removeFromParent(ctx, "", ctx.getPath()))); - } - }).produce(); - - List computeHints = new HintsInvoker(HintsSettings.getGlobalSettings(), new AtomicBoolean()).computeHints(info, Collections.singleton(hd)); - - assertEquals(computeHints.toString(), 1, computeHints.size()); - - Fix fix = computeHints.get(0).getFixes().getFixes().get(0); - - fix.implement(); - - assertEquals(golden, doc.getText(0, doc.getLength())); - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/MatcherUtilitiesTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/MatcherUtilitiesTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,113 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc. - */ - -package org.netbeans.spi.java.hints; - -import com.sun.source.util.TreePath; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.regex.Pattern; -import org.netbeans.modules.java.hints.spiimpl.SPIAccessor; -import org.netbeans.modules.java.hints.spiimpl.TestBase; -import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings; - -/** - * - * @author lahvac - */ -public class MatcherUtilitiesTest extends TestBase { - - public MatcherUtilitiesTest(String name) { - super(name); - } - - public void testParentMatches1() throws Exception { - String code = "package test; public class Test { private int test() { int i = 0; i = test(|); } }"; - int pos = code.indexOf("|"); - - code = code.replaceAll(Pattern.quote("|"), ""); - - prepareTest("test/Test.java", code); - - TreePath tp = info.getTreeUtilities().pathFor(pos); - HintContext ctx = SPIAccessor.getINSTANCE().createHintContext(info, HintsSettings.getGlobalSettings(), null, null, tp, Collections.emptyMap(), Collections.>emptyMap(), Collections.emptyMap()); - - assertTrue(MatcherUtilities.matches(ctx, ctx.getPath().getParentPath(), "$0 = $_")); - } - - public void testParentMatches2() throws Exception { - String code = "package test; public class Test { private int test() { int i = test(|); } }"; - int pos = code.indexOf("|"); - - code = code.replaceAll(Pattern.quote("|"), ""); - - prepareTest("test/Test.java", code); - - TreePath tp = info.getTreeUtilities().pathFor(pos); - HintContext ctx = SPIAccessor.getINSTANCE().createHintContext(info, HintsSettings.getGlobalSettings(), null, null, tp, Collections.emptyMap(), Collections.>emptyMap(), Collections.emptyMap()); - - assertTrue(MatcherUtilities.matches(ctx, ctx.getPath().getParentPath(), "$1 $0 = $_;")); - } - - public void testOutVariables1() throws Exception { - String code = "package test; public class Test { private int test() { int i = test(|); } }"; - int pos = code.indexOf("|"); - - code = code.replaceAll(Pattern.quote("|"), ""); - - prepareTest("test/Test.java", code); - - TreePath tp = info.getTreeUtilities().pathFor(pos); - HintContext ctx = SPIAccessor.getINSTANCE().createHintContext(info, HintsSettings.getGlobalSettings(), null, null, tp, Collections.emptyMap(), Collections.>emptyMap(), Collections.emptyMap()); - - Map outVariables = new HashMap(); - Map> outMultiVariables = new HashMap>(); - Map outVariables2Names = new HashMap(); - - assertTrue(MatcherUtilities.matches(ctx, ctx.getPath().getParentPath(), "$1 $0 = $_;", outVariables, outMultiVariables, outVariables2Names)); - assertEquals("int", outVariables.get("$1").getLeaf().toString()); - assertEquals("i", outVariables2Names.get("$0")); - } - -} \ No newline at end of file diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/TestUtils.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/TestUtils.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2015 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2015 Sun Microsystems, Inc. - */ -package org.netbeans.spi.java.hints; - -import org.netbeans.api.editor.mimelookup.MimePath; -import org.netbeans.modules.editor.impl.DocumentFactoryImpl; -import org.netbeans.spi.editor.mimelookup.MimeDataProvider; -import org.openide.util.Lookup; -import org.openide.util.lookup.Lookups; -import org.openide.util.lookup.ServiceProvider; - -/** - * - * @author lahvac - */ -public class TestUtils { - - @ServiceProvider(service = MimeDataProvider.class) - public static final class MimeDataProviderImpl implements MimeDataProvider { - - private final Lookup l = Lookups.singleton(new DocumentFactoryImpl()); - - @Override - public Lookup getLookup(MimePath mimePath) { - return "text/x-java".equals(mimePath.getPath()) ? l : Lookup.EMPTY; - } - - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/matching/CopyFinderTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/matching/CopyFinderTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1612 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * Contributor(s): - * - * Portions Copyrighted 2007-2010 Sun Microsystems, Inc. - */ -package org.netbeans.spi.java.hints.matching; - -import com.sun.source.tree.BlockTree; -import com.sun.source.tree.StatementTree; -import com.sun.source.tree.Tree; -import com.sun.source.tree.VariableTree; -import com.sun.source.util.SourcePositions; -import com.sun.source.util.TreePath; -import com.sun.source.util.TreePathScanner; -import java.io.File; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.lang.model.element.VariableElement; -import javax.lang.model.type.TypeMirror; -import javax.swing.text.Document; -import org.netbeans.api.java.lexer.JavaTokenId; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.JavaSource.Phase; -import org.netbeans.api.java.source.SourceUtilsTestUtil; -import org.netbeans.api.java.source.TestUtilities; -import org.netbeans.api.java.source.TreePathHandle; -import org.netbeans.api.java.source.matching.MatchingTestAccessor; -import org.netbeans.api.java.source.matching.Pattern; -import org.netbeans.api.lexer.Language; -import org.netbeans.junit.NbTestCase; -import org.netbeans.modules.java.hints.introduce.IntroduceMethodFix; -import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch; -import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch.BulkPattern; -import org.netbeans.modules.java.hints.spiimpl.pm.PatternCompiler; -import org.netbeans.modules.java.hints.spiimpl.pm.PatternCompilerUtilities; -import org.netbeans.modules.java.source.matching.CopyFinder; -import org.netbeans.modules.java.source.matching.CopyFinder.Cancel; -import org.netbeans.modules.java.source.matching.CopyFinder.Options; -import org.netbeans.modules.java.source.matching.CopyFinder.VariableAssignments; -import org.openide.cookies.EditorCookie; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; -import org.openide.loaders.DataObject; - -/** - * - * @author Jan Lahoda - */ -public class CopyFinderTest extends NbTestCase { - - public CopyFinderTest(String testName) { - super(testName); - } - -// public static TestSuite suite() { -// NbTestSuite nb = new NbTestSuite(); -// -// nb.addTest(new CopyFinderTest("testCorrectSite3")); -// -// return nb; -// } - - @Override - protected void setUp() throws Exception { - SourceUtilsTestUtil.prepareTest(new String[0], new Object[0]); - super.setUp(); - } - - public void testSimple1() throws Exception { - performTest("package test; public class Test {public void test() {int i = 0; y = i + i; y = i + i;}}", 90 - 22, 95 - 22, 101 - 22, 106 - 22); - } - -// public void testSimple2() throws Exception { -// performTest("package test; public class Test {public void test() {int i = 0; y = i + i; y = i + i + i;}}", 90 - 22, 95 - 22, 101 - 22, 106 - 22); -// } - - public void testSimple3() throws Exception { - performTest("package test; public class Test {public void test() {int i = System.currentTimeMillis(); y = System.currentTimeMillis();}}", 83 - 22, 109 - 22, 115 - 22, 141 - 22); - } - - public void testSimple4() throws Exception { - performTest("package test; import java.util.ArrayList; public class Test {public void test() {Object o = new ArrayList();o = new ArrayList();}}", 114 - 22, 137- 22, 142 - 22, 165 - 22); - } - - public void testSimple5() throws Exception { - performTest("package test; public class Test {public void test() {Object o = null; String s = (String) o; s = (String) o; s = (String) null; o = (Object) o;}}", 103 - 22, 113 - 22, 119 - 22, 129 - 22); - } - - public void testSimple6() throws Exception { - performTest("package test; public class Test {public void test() {int i = 0; y = i + i; y = i + i;} public void test2() {int i = 0; y = i + i; y = i + i;}}", 90 - 22, 95 - 22, 101 - 22, 106 - 22); - } - - public void testSimple7() throws Exception { - performTest("package test; public class Test {public void test() {int i = 0; y = i != 0 ? i + i : i * i; y = i != 0 ? i + i : i * i; y = i != 1 ? i + i : i * i; y = i == 0 ? i + i : i * i; y = i != 0 ? i * i : i * i; y = i != 0 ? i + i : i + i; y = i != 0 ? i + i : i * 1;}}", 90 - 22, 112 - 22, 118 - 22, 140 - 22); - } - - public void testSimple8() throws Exception { - performTest("package test; public class Test {public void test() {int i = 0; int y = -i; y = -i; y = +i; y = +y;}}", 94 - 22, 96 - 22, 102 - 22, 104 - 22); - } - - public void testSimple9() throws Exception { - performTest("package test; public class Test {public void test() {int i = 0; int y = i *= 9; y = i *= 9; y = i /= 9; y = i *= 8; y = y *= 9;}}", 94 - 22, 100 - 22, 106 - 22, 112 - 22); - } - - public void testSimple10() throws Exception { - performTest("package test; public class Test {public void test() {int[] i = null; int y = i[1]; y = i[1]; y = i[y]; y = i[0];}}", 99 - 22, 103 - 22, 109 - 22, 113 - 22); - } - - public void testSimple11() throws Exception { - performTest("package test; public class Test {public void test() {int[] i = new int[0]; i = new int[0]; i = new int[1];}}", 85 - 22, 95 - 22, 101 - 22, 111 - 22); - } - - public void testSimple12() throws Exception { - performTest("package test; public class Test {public void test() {int[] i = new int[1]; i = new int[1]; i = new int[0];}}", 85 - 22, 95 - 22, 101 - 22, 111 - 22); - } - - public void testSimple13() throws Exception { - performTest("package test; public class Test {public void test() {int i = 0; int y = (i); y = (i); y = i;}}", 94 - 22, 97 - 22, 103 - 22, 106 - 22); - } - - public void testSimple14() throws Exception { - performTest("package test; public class Test {public void test() {Object o = null; boolean b = o instanceof String; b = o instanceof String; b = o instanceof Object;}}", 104 - 22, 123 - 22, 129 - 22, 148 - 22); - } - - public void testSimple15() throws Exception { - performTest("package test; public class Test {private int x = 1; private int y = 1; public void test() {int x = 1; int y = 1;}}", 90 - 22, 91 - 22, 71 - 22, 72 - 22, 121 - 22, 122 - 22, 132 - 22, 133 - 22); - } - - public void testSimple16() throws Exception { - performTest("package test; public class Test {public void test(int i) {int y = \"\".length(); test(\"\".length());} }", 88 - 22, 99 - 22, 106 - 22, 117 - 22); - } - - public void testSimple17() throws Exception { - performTest("package test; public class Test {public void test2() {int a = test(test(test(1))); a = test(test(test(1))); a = test(test(test(1)));} public int test(int i) {return 0;} }", 94 - 22, 101 - 22, 119 - 22, 126 - 22, 144 - 22, 151 - 22); - } - - public void testMemberSelectAndIdentifierAreSame() throws Exception { - performTest("package test; import static java.lang.String.*; public class Test {public void test1() {|String.valueOf(2)|; |valueOf(2)|;} }"); - } - - public void testVariables1() throws Exception { - performVariablesTest("package test; import static java.lang.String.*; public class Test {public void test1() {String.valueOf(2+4);} }", - "java.lang.String.valueOf($1)", - new Pair[] {new Pair("$1", new int[] {134 - 31, 137 - 31})}, - new Pair[0]); - } - - public void testAssert1() throws Exception { - performTest("package test; public class Test {public void test() {int i = 0; |assert i == 1;| |assert i == 1;|}}"); - } - - public void testReturn1() throws Exception { - performTest("package test; public class Test {public int test1() {|return 1;|} public int test2() {|return 1;|}}"); - } - - public void testIf1() throws Exception { - performTest("package test; public class Test {public void test() { int i = 0; int j; |if (i == 0) {j = 1;} else {j = 2;}| |if (i == 0) {j = 1;} else {j = 2;}| } }"); - } - - public void testExpressionStatement1() throws Exception { - performTest("package test; public class Test {public void test() { int i = 0; |i = 1;| |i = 1;| } }"); - } - - public void testBlock1() throws Exception { - performTest("package test; public class Test {public void test() { int i = 0; |{i = 1;}| |{i = 1;}| } }"); - } - - public void testSynchronized1() throws Exception { - performTest("package test; public class Test {public void test() { Object o = null; int i = 0; |synchronized (o) {i = 1;}| |synchronized (o) {i = 1;}| } }"); - } - -// public void testEnhancedForLoop() throws Exception { -// performTest("package test; public class Test {public void test(Iterable i) { |for (String s : i) { System.err.println(); }| |for (String s : i) { System.err.println(); }| }"); -// } - -// public void testConstants() throws Exception { -// performTest("package test; public class Test {public static final int A = 3; public void test() { int i = |3|; i = |test.Test.A|; } }"); -// } - - public void testOverridingImplementing1() throws Exception { - performVariablesTest("package test; public class Test implements Runnable { { this.run(); } public void run() { } } }", - "$0{java.lang.Runnable}.run()", - new Pair[] {new Pair("$0", new int[] {56, 60})}, - new Pair[0]); - } - - public void testMemberSelectCCE() throws Exception { - //should not throw a CCE - //(selected regions are not duplicates) - performTest("package test; public class Test {public static class T extends Test { public void test() { |Test.test|(); |System.err.println|(); } } }", false); - } - - public void testLocalVariable() throws Exception { - performVariablesTest("package test; public class Test {public void test1() { { int y; y = 1; } int z; { int y; z = 1; } } }", - "{ int $1; $1 = 1; }", - new Pair[0], - new Pair[] {new Pair("$1", "y")}); - } - - public void testStatementAndSingleBlockStatementAreSame1() throws Exception { - performVariablesTest("package test; public class Test {public void test1() { { int x; { x = 1; } } } }", - "{ int $1; $1 = 1; }", - new Pair[0], - new Pair[] {new Pair("$1", "x")}); - } - - public void testStatementAndSingleBlockStatementAreSame2() throws Exception { - performVariablesTest("package test; public class Test {public void test1() { { int x; x = 1; } } }", - "{ int $1; { $1 = 1; } }", - new Pair[0], - new Pair[] {new Pair("$1", "x")}); - } - - public void testStatementVariables() throws Exception { - performVariablesTest("package test; public class Test {public int test1() { if (true) return 1; else return 2; } }", - "if ($1) $2; else $3;", - new Pair[] { - new Pair("$1", new int[] {89 - 31, 93 - 31}), - new Pair("$2", new int[] {95 - 31, 104 - 31}), - new Pair("$3", new int[] {110 - 31, 119 - 31}) - }, - new Pair[0]); - } - - public void testThrowStatement() throws Exception { - performVariablesTest("package test; public class Test {public void test() { throw new NullPointerException(); throw new IllegalStateException();} }", - "throw new NullPointerException()", - new Pair[0], - new Pair[0]); - } - - public void testMultiStatementVariables1() throws Exception { - performVariablesTest("package test; public class Test { public int test1() { System.err.println(); System.err.println(); int i = 3; System.err.println(i); System.err.println(i); return i; } }", - "{ $s1$; int $i = 3; $s2$; return $i; }", - new Pair[0], - new Pair[] { - new Pair("$s1$", new int[] {55, 76, 77, 98}), - new Pair("$s2$", new int[] {110, 132, 133, 155}) - }, - new Pair[] {new Pair("$i", "i")}); - } - - public void testMultiStatementVariables2() throws Exception { - performVariablesTest("package test; public class Test { public int test1() { int i = 3; return i; } }", - "{ $s1$; int $i = 3; $s2$; return $i; }", - new Pair[0], - new Pair[] { - new Pair("$s1$", new int[] {}), - new Pair("$s2$", new int[] {}), - }, - new Pair[] {new Pair("$i", "i")}); - } - - public void testMultiStatementVariablesAndBlocks1() throws Exception { - performVariablesTest("package test; public class Test { public void test1() { if (true) System.err.println(); } }", - "if ($c) {$s1$; System.err.println(); $s2$; }", - new Pair[] {new Pair("$c", new int[] {60, 64})}, - new Pair[] { - new Pair("$s1$", new int[] {}), - new Pair("$s2$", new int[] {}), - }, - new Pair[0]); - } - - public void testMultiStatementVariablesAndBlocks2() throws Exception { - performVariablesTest("package test; public class Test { public void test1() { if (true) System.err.println(); } }", - "if ($c) {$s1$; System.err.println(); }", - new Pair[] {new Pair("$c", new int[] {60, 64})}, - new Pair[] { - new Pair("$s1$", new int[] {}), - }, - new Pair[0]); - } - - public void testMultiStatementVariablesAndBlocks3() throws Exception { - performVariablesTest("package test; public class Test { public void test1() { if (true) System.err.println(); } }", - "if ($c) {System.err.println(); $s2$; }", - new Pair[] {new Pair("$c", new int[] {60, 64})}, - new Pair[] { - new Pair("$s2$", new int[] {}), - }, - new Pair[0]); - } - - public void testMultiStatementVariablesAndBlocks4() throws Exception { - performVariablesTest("package test; public class Test { public void test1() { if (true) System.err.println(); } }", - "if ($c) { $s$; }", - new Pair[] {new Pair("$c", new int[] {60, 64})}, - new Pair[] { - new Pair("$s$", new int[] {66, 87}), - }, - new Pair[0]); - } - - public void testVariableVerification() throws Exception { - performVariablesTest("package test; public class Test { public void test1(String[] a, String[] b) { for (int c = 0; c < a.length; c++) { String s = b[c]; System.err.println(s); } } }", - "for(int $i = 0; $i < $array.length; $i++) { $T $var = $array[$i]; $stmts$; }", - new Pair[0], - new Pair[0], - new Pair[0], - true); - } - - public void testFor() throws Exception { - performVariablesTest("package test; public class Test { public void test1(String[] a) { for (int c = 0; c < a.length; c++) { String s = a[c]; System.err.println(s); } } }", - "for(int $i = 0; $i < $array.length; $i++) { $T $var = $array[$i]; $stmts$; }", - new Pair[] { - new Pair("$array", new int[] {117 - 31, 118 - 31}), - new Pair("$T", new int[] {134 - 31, 140 - 31}), - }, - new Pair[] { - new Pair("$stmts$", new int[] {151 - 31, 173 - 31}), - }, - new Pair[] { - new Pair("$i", "c"), - new Pair("$var", "s"), - }); - } - - public void testEnhancedFor() throws Exception { - performVariablesTest("package test; public class Test { public void test1(String[] a) { for (String s : a) { System.err.println(s); } } }", - "for($T $var : $array) { $stmts$; }", - new Pair[] { - new Pair("$array", new int[] {113 - 31, 114 - 31}), - new Pair("$T", new int[] {102 - 31, 108 - 31}), - }, - new Pair[] { - new Pair("$stmts$", new int[] {118 - 31, 140 - 31}), - }, - new Pair[] { - new Pair("$var", "s"), - }); - } - - public void testWhile() throws Exception { - performVariablesTest("package test; public class Test { public void test1(String[] a) { int c = 0; while (c < a.length) { String s = a[c]; System.err.println(s); c++; } } }", - "while ($i < $array.length) { $T $var = $array[$i]; $stmts$; $i++; }", - new Pair[] { - new Pair("$array", new int[] {120 - 31, 121 - 31}), - new Pair("$T", new int[] {132 - 31, 138 - 31}), - new Pair("$i", new int[] {116 - 31, 117 - 31}), - }, - new Pair[] { - new Pair("$stmts$", new int[] {149 - 31, 171 - 31}), - }, - new Pair[] { - new Pair("$var", "s"), - }); - } - - public void testDoWhile() throws Exception { - performVariablesTest("package test; public class Test { public void test1(String[] a) { int c = 0; do { String s = a[c]; System.err.println(s); c++; } while (c < a.length); } }", - "do { $T $var = $array[$i]; $stmts$; $i++; } while ($i < $array.length);", - new Pair[] { - new Pair("$array", new int[] {124 - 31, 125 - 31}), - new Pair("$T", new int[] {113 - 31, 119 - 31}), - new Pair("$i", new int[] {126 - 31, 127 - 31}), - }, - new Pair[] { - new Pair("$stmts$", new int[] {130 - 31, 152 - 31}), - }, - new Pair[] { - new Pair("$var", "s"), - }); - } - - public void testArrayType() throws Exception { - performVariablesTest("package test; public class Test { public void test1() { int[][] a; } }", - "$T[]", - new Pair[] { - new Pair("$T", new int[] {87 - 31, /*92*//*XXX:*/94 - 31}), - }, - new Pair[0], - new Pair[0]); - } - - public void testSemiMatchPackage() throws Exception { - performVariablesTest("package test; import javax.lang.model.type.TypeMirror; public class Test { }", - "$T{java.lang.Object}.type", - new Pair[0], - new Pair[0], - new Pair[0], - true); - } - - public void testNullType() throws Exception { - performVariablesTest("package javax.lang.model.type; public class Test { }", - "$T{java.lang.Object}.type", - new Pair[0], - new Pair[0], - new Pair[0], - true); - } - - public void testTryCatch() throws Exception { - performVariablesTest("package test; import java.io.*; public class Test { public void test() { InputStream ins = null; try { ins = new FileInputStream(\"\"); } catch (IOException e) { e.printStackTrace(); } finally {ins.close();} } }", - "try {$stmts$;} catch (java.io.IOException $e) {$e.printStackTrace();} finally {$finally$;}", - new Pair[] { - new Pair("$e", new int[] {176 - 31 - 2, 189 - 31 - 2}), - }, - new Pair[] { - new Pair("$stmts$", new int[] {134 - 31, 166 - 31 - 2}), - new Pair("$finally$", new int[] {225 - 31 - 2, 237 - 31 - 2}), - }, - new Pair[] { - new Pair("$e", "e"), - }); - } - - public void testMultiParameters1() throws Exception { - performVariablesTest("package test; public class Test { { java.util.Arrays.asList(\"a\", \"b\", \"c\"); }", - "java.util.Arrays.asList($1$)", - new Pair[] { - }, - new Pair[] { - new Pair("$1$", new int[] {60, 63, 65, 68, 70, 73}), - }, - new Pair[] { - }); - } - - public void testMultiParameters2() throws Exception { - performVariablesTest("package test; public class Test { { java.util.Arrays.asList(new String(\"a\"), \"b\", \"c\"); }", - "java.util.Arrays.asList(new String(\"a\"), $1$)", - new Pair[] { - }, - new Pair[] { - new Pair("$1$", new int[] {77, 80, 82, 85}), - }, - new Pair[] { - }); - } - - public void testMultiParameters3() throws Exception { - performVariablesTest("package test; public class Test { { java.util.Arrays.asList(); }", - "java.util.Arrays.asList($1$)", - new Pair[] { - }, - new Pair[] { - new Pair("$1$", new int[] {}), - }, - new Pair[] { - }); - } - - public void testTypeParameters() throws Exception { - performVariablesTest("package test; public class Test { { java.util.Arrays.asList(\"a\", \"b\"); }", - "java.util.Arrays.<$1>asList($1$)", - new Pair[] { - new Pair("$1", new int[] {85 - 31, 91 - 31}), - }, - new Pair[] { - }, - new Pair[] { - }); - } - - public void testModifiers() throws Exception { - performVariablesTest("package test; public class Test { private String s; }", - "$mods$ java.lang.String $name;", - new Pair[] { - new Pair("$name", new int[] {65 - 31, 82 - 31}), - new Pair("$mods$", new int[] {65 - 31, 72 - 31}), //XXX: shouldn't this be a multi-variable? - }, - new Pair[] { - }, - new Pair[] { - new Pair("$name", "s"), - }); - } - - public void testVariableIsFullPattern1() throws Exception { - performVariablesTest("package test; public class Test { private int a; {System.err.println(a);} }", - "$0{int}", - new Pair[] { - new Pair("$0", new int[] {100 - 31, 101 - 31}), - }, - new Pair[] { - }, - new Pair[] { - }); - } - - public void testVariableIsFullPattern2() throws Exception { - performVariablesTest("package test; public class Test { private int a; {System.err.println(a);} }", - "$0{int}", - new Pair[] { - new Pair("$0", new int[] {100 - 31, 101 - 31}), - }, - new Pair[] { - }, - new Pair[] { - }, - false, - true); - } - - public void testNoCCEForVariableName() throws Exception { - performVariablesTest("package test; public class Test { { int[] arr = null; int a; arr[a] = 0;} }", - "int $a; $a = 0;", - new Pair[] { - }, - new Pair[] { - }, - new Pair[] { - }, - true, - true); - } - - public void testVerifySameTrees1() throws Exception { - performVariablesTest("package test; public class Test { { if (true) { System.err.println(); } else { System.err.println(); System.err.println(); } } }", - "if ($c) $s; else $s;", - new Pair[] { - }, - new Pair[] { - }, - new Pair[] { - }, - true, - true); - } - - public void testVerifySameTreesMultiVariables1() throws Exception { - performVariablesTest("package test; public class Test { { if (true) { System.err.println(); System.err.println(); } else { System.err.println(); System.err.println(); System.err.println(); } } }", - "if ($c) { $s$;} else { $s$; }", - new Pair[] { - }, - new Pair[] { - }, - new Pair[] { - }, - true, - true); - } - - public void testVerifySameTreesMultiVariables2() throws Exception { - performVariablesTest("package test; public class Test { { if (true) { System.err.println(1); System.err.println(); } else System.err.println(1); } }", - "if ($c) { System.err.println(1); $s2$; } else { System.err.println(1); $s2$; }", - new Pair[] { - }, - new Pair[] { - }, - new Pair[] { - }, - true, - true); - } - - public void testVerifySameTreesMultiVariables3() throws Exception { - performVariablesTest("package test; public class Test { { if (true) { System.err.println(); System.err.println(1); } else System.err.println(1); } }", - "if ($c) { $s1$; System.err.println(1); } else { $s1$; System.err.println(1); }", - new Pair[] { - }, - new Pair[] { - }, - new Pair[] { - }, - true, - true); - } - - public void XtestVerifySameTreesMultiVariables4() throws Exception { - performVariablesTest("package test; public class Test { { if (true) { System.err.println(); System.err.println(1); System.err.println(); } else System.err.println(1); } }", - "if ($c) { $s1$; System.err.println(1); $s2$; } else { $s1$; System.err.println(1); $s2$; }", - new Pair[] { - }, - new Pair[] { - }, - new Pair[] { - }, - true, - true); - } - - public void testVerifySameTreesMultiVariables5() throws Exception { - performVariablesTest("package test; public class Test { { if (true) { System.err.println(1); } else System.err.println(2); } }", - "if ($c) { $s$; } else { $s$; }", - new Pair[] { - }, - new Pair[] { - }, - new Pair[] { - }, - true, - true); - } - - public void testSimpleRemapping1() throws Exception { - performRemappingTest("package test;\n" + - "public class Test {\n" + - " void t1() {\n" + - " int i = 0;\n" + - " |System.err.println(i);|\n" + - " }\n" + - " void t2() {\n" + - " int a = 0;\n" + - " |System.err.println(a);|\n" + - " }\n" + - "}\n", - "i", - Options.ALLOW_REMAP_VARIABLE_TO_EXPRESSION); - } - - public void testSimpleRemapping2() throws Exception { - performRemappingTest("package test;\n" + - "public class Test {\n" + - " void t1() {\n" + - " int i = 0;\n" + - " |System.err.println(i);\n" + - " int i2 = 0;\n" + - " System.err.println(i2);|\n" + - " }\n" + - " void t2() {\n" + - " int a = 0;\n" + - " |System.err.println(a);\n" + - " int a2 = 0;\n" + - " System.err.println(a2);|\n" + - " }\n" + - "}\n", - "i", - Options.ALLOW_REMAP_VARIABLE_TO_EXPRESSION); - } - - public void testSimpleRemapping3() throws Exception { - performRemappingTest("package test;\n" + - "public class Test {\n" + - " void t1() {\n" + - " |int i = 0;\n" + - " System.err.println(i);\n" + - " int i2 = 0;\n" + - " System.err.println(i2);|\n" + - " }\n" + - " void t2() {\n" + - " |int a = 0;\n" + - " System.err.println(a);\n" + - " int a2 = 0;\n" + - " System.err.println(a2);|\n" + - " }\n" + - "}\n", - "", - Options.ALLOW_REMAP_VARIABLE_TO_EXPRESSION); - } - - public void testSimpleRemapping4() throws Exception { - performRemappingTest("package test;\n" + - "public class Test {\n" + - " void t1() {\n" + - " int i = 0;\n" + - " |System.err.println(i);|\n" + - " }\n" + - " void t2() {\n" + - " int[] a = {0};\n" + - " |System.err.println(a[0]);|\n" + - " }\n" + - "}\n", - "i", - Options.ALLOW_REMAP_VARIABLE_TO_EXPRESSION); - } - - public void testPreventRemapOnExpressions1() throws Exception { - performRemappingTest("package test;\n" + - "public class Test {\n" + - " void t1() {\n" + - " Throwable t = null;\n" + - " |System.err.println(t);|\n" + - " }\n" + - " void t2() {\n" + - " Throwable t = null;\n" + - " |System.err.println(t.getCause());|\n" + - " }\n" + - "}\n", - "t", - Options.ALLOW_REMAP_VARIABLE_TO_EXPRESSION); - } - - public void testPreventRemapOnExpressions2() throws Exception { - performRemappingTest("package test;\n" + - "public class Test {\n" + - " void t1() {\n" + - " Throwable t = null;\n" + - " |System.err.println(t);|\n" + - " }\n" + - " void t2() {\n" + - " Throwable t = null;\n" + - " System.err.println(t.getCause());\n" + - " }\n" + - "}\n", - "t"); - } - - public void testVariableMemberSelect() throws Exception { - performVariablesTest("package test; public class Test {public void test(String str) { str.length(); str.length(); } public void test1(String str) { str.length(); str.isEmpty(); } }", - "{ $str.$method(); $str.$method(); }", - new Pair[0], - new Pair[] {new Pair("$method", "length")}); - } - - public void testCorrectSite1() throws Exception { - performVariablesTest("package test; public class Test { public void test(Object o) { o.wait(); } }", - "$s{java.util.concurrent.locks.Condition}.wait()", - new Pair[0], - new Pair[0], - new Pair[0], - true); - } - - public void testCorrectSite2() throws Exception { - performVariablesTest("package test; public class Test { public void test(Object o) { wait(); } }", - "$s{java.util.concurrent.locks.Condition}.wait()", - new Pair[0], - new Pair[0], - new Pair[0], - true); - } - - public void testCorrectSite3() throws Exception { - performVariablesTest("package test; public abstract class Test implements java.util.concurrent.locks.Condition { public void test() { new Runnable() { public void run() { wait(); } } } }", - "$0{java.util.concurrent.locks.Condition}.wait()", - new Pair[0],// {new Pair("$s", new int[] {-1, -1})}, - new Pair[0], - new Pair[0]); - } - - public void testCorrectSite4() throws Exception { - performVariablesTest("package test; public class Test { public void test() { foo.stop(); } }", - "$0{java.lang.Thread}.stop()", - new Pair[0], - new Pair[0], - new Pair[0], - true); - } - - public void testDotClassForSameClass() throws Exception { - performTest("package test; public class Test { {Class c = |Test.class|; c = |Test.class|; c = String.class; } }"); - } - - public void testTryCatchVariable() throws Exception { - performVariablesTest("package test; public class Test { { try { throw new java.io.IOException(); } catch (java.io.IOException ex) { } } }", - "try { $stmts$; } catch $catches$", - new Pair[] { - }, - new Pair[] { - new Pair("$stmts$", new int[] {42, 74}), - new Pair("$catches$", new int[] {77, 111}), - }, - new Pair[] { - }, - false, - true); - } - - public void testMatchInterfaceNoFQN() throws Exception { - performTest("package test; import java.util.*; public class Test { public void test() { |List| l1; |java.util.List| l2;} }"); - } - - public void testUnresolvableNonMatchingConstraint() throws Exception { - performVariablesTest("package test; public class Test { private Object a; {System.err.println(a);} }", - "System.err.println($v{does.not.Exist}", - new Pair[0], - new Pair[0], - new Pair[0], - true); - } - - public void testIndexOutOfBoundsInMultiList() throws Exception { - performVariablesTest("package test;" + - "public class Test {" + - " public void test() {" + - " int i = 0;" + - " int j = 0;" + - " i++;" + - " j++;" + - " }" + - "}", - "{$type $i = $init; $stms$; $i++;}", - new Pair[0], - new Pair[0], - new Pair[0], - true, - false); - } - - public void testCorrectSite192812() throws Exception { - performVariablesTest("package test; public class Test { private int i; public void test(Test t) { t.i = i - 10; } }", - "$t = $t - $v", - new Pair[0], - new Pair[0], - new Pair[0], - true, - true); - } - - public void testCorrectSite183367() throws Exception { - performVariablesTest("package test; public class Test { public void test(java.util.List l) { l.subList(0, 0).remove(0); } }", - "$l{java.util.Collection}.remove($o{java.lang.Object})", - new Pair[0], - new Pair[0], - new Pair[0], - true, - true); - } - - public void testDisableVariablesWhenVerifyingDuplicates1() throws Exception { - performVariablesTest("package test; public class Test { public void test() { int $i = 1, $j = 2; int k = $i + $i; } }", - "$i + $i", - new Pair[] {new Pair("$i", new int[] {83, 85})}, - new Pair[0], - new Pair[0], - false, - true); - } - - public void testDisableVariablesWhenVerifyingDuplicates2() throws Exception { - performVariablesTest("package test; public class Test { public void test() { int $i = 1, $j = 2; int k = $i + $i; } }", - "$i + $i", - new Pair[] {new Pair("$i", new int[] {83, 85})}, - new Pair[0], - new Pair[0], - false, - false); - } - - public void testMethodMatchingMoreParams() throws Exception { - performVariablesTest("package test; public class Test {public void test(String s1, String s2) { } }", - "public void test($params$) { }", - new Pair[0], - new Pair[] {new Pair("$params$", new int[] {50, 59, 61, 70})}, - new Pair[0], - false, - true); - } - - public void testLambdaInput1() throws Exception { - performVariablesTest("package test; public class Test {public void test() { new java.io.FilenameFilter() { public boolean accept(File dir, String name) { } }; } }", - "new $type() {public $retType $name($params$) { $body$; } }", - new Pair[0], - new Pair[] {new Pair("$params$", new int[] { 107, 115, 117, 128 })}, - new Pair[] {new Pair("$name", "accept")}, - false, - false); - } - - public void testLambdaInput2() throws Exception { - performVariablesTest("package test; public class Test {public void test() { new java.io.FilenameFilter() { public boolean accept(File dir, String name) { } }; } }", - "new $type() { $mods$ $retType $name($params$) { $body$; } }", - new Pair[0], - new Pair[] {new Pair("$params$", new int[] { 107, 115, 117, 128 })}, - new Pair[] {new Pair("$name", "accept")}, - false, - true); - } - - public void testSwitch1() throws Exception { - performVariablesTest("package test;\n" + - "public class Test {\n" + - " {\n" + - " E e = null;\n" + - " switch (e) {\n" + - " case A: System.err.println(1); break;\n" + - " case D: System.err.println(2); break;\n" + - " case E: System.err.println(3); break;\n" + - " }\n" + - " }\n" + - " public enum E {A, B, C, D, E, F;}\n" + - "}\n", - "switch ($0{test.Test.E}) { case $c1$ case D: $stmts$; case $c2$ }", - new Pair[] {new Pair("$0", new int[] {79, 80})}, - new Pair[] { - new Pair("$stmts$", new int[] { 156, 178, 179, 185 }), - new Pair("$c1$", new int[] { 97, 134 }), - new Pair("$c2$", new int[] { 199, 236 }), - }, - new Pair[0], - false, - false); - } - - public void testWildcard1() throws Exception { - performTest("package test; import java.util.*; public class Test { public void test() { |List| l1; |List| l2;} }"); - } - - public void testWildcard2() throws Exception { - performTest("package test; import java.util.*; public class Test { public void test() { |List| l1; |List| l2;} }"); - } - - public void testWildcard3() throws Exception { - performTest("package test; import java.util.*; public class Test { public void test() { |List| l1; |List| l2;} }"); - } - - public void testSingleVariableStrict() throws Exception { - performVariablesTest("package test; public class Test { public void test() { if (true) System.err.println(1); } }", - "if ($c) $then; else $else;", - new Pair[0], - new Pair[0], - new Pair[0], - true, - true); - } - - public void testMultiVariableZeroOrOne1() throws Exception { - performVariablesTest("package test; public class Test { public void test() { if (true) System.err.println(1); } }", - "if ($c) $then; else $else$;", - new Pair[] {new Pair("$c", new int[] {59, 63}), - new Pair("$then", new int[] {65, 87})}, - new Pair[0], - new Pair[0], - false, - true); - } - - public void testMultiVariableZeroOrOne2() throws Exception { - performVariablesTest("package test; public class Test { public void test() { if (true) System.err.println(1); else System.err.println(2); } }", - "if ($c) $then; else $else$;", - new Pair[] {new Pair("$c", new int[] {59, 63}), - new Pair("$then", new int[] {65, 87}), - new Pair("$else$", new int[] {93, 115})}, - new Pair[0], - new Pair[0], - false, - true); - } - - public void testNonResolvableType() throws Exception { - performVariablesTest("package test; public class Test { { java.io.File f = null; boolean b = f.isDirectory(); } }", - "$1{can.not.Resolve}.$m($args$)", - new Pair[0], - new Pair[0], - new Pair[0], - true, - true); - } - - public void testTryWithResources() throws Exception { - performVariablesTest("package test; public class Test { { try (java.io.InputStream in = null) { System.err.println(1); } } }", - "try ($resources$) {$body$;}", - new Pair[] { - }, - new Pair[] { - new Pair("$resources$", new int[] {41, 70}), - new Pair("$body$", new int[] {74, 96}), - }, - new Pair[] { - }, - false, - true); - } - - public void testIgnoreOtherKind() throws Exception { - performVariablesTest("package test; public class Test { private java.util.Collection x() { return java.util.Collections.emptySet(); } } }", - "$i{java.lang.Class}", - new Pair[] { - }, - new Pair[] { - }, - new Pair[] { - }, - true, - true); - } - - public void testSearchPackageClause() throws Exception { - performVariablesTest("package test.a; public class Test { }", - "test.$1", - new Pair[] { - }, - new Pair[] { - }, - new Pair[] { - new Pair("$1", "a"), - }, - false, - true); - } - - public void testPackageImport() throws Exception { - performVariablesTest("package test; import java.util.*; public class Test { }", - "java.$1", - new Pair[] { - }, - new Pair[] { - }, - new Pair[] { - new Pair("$1", "util"), - }, - false, - true); - } - - public void testSubclassMatching() throws Exception { - performVariablesTest("package test; import java.util.*; public abstract class Test { Map.Entry e; }", - "java.util.Map.$1", - new Pair[] { - }, - new Pair[] { - }, - new Pair[] { - new Pair("$1", "Entry"), - }, - false, - true); - } - - public void testMethodTypeParameters1() throws Exception { - performVariablesTest("package test; public class Test { private void t() { } }", - "$mods$ <$tp$> $ret $name($args$) { $body$; }", - new Pair[] { - new Pair("$ret", new int[] {42, 46}), - new Pair("$mods$", new int[] {34, 41}), - }, - new Pair[] { - new Pair("$tp$", new int[] {}), - new Pair("$args$", new int[] {}), - new Pair("$body$", new int[] {}), - }, - new Pair[] { - new Pair("$name", "t") - }, - false, - false); - } - - public void testMethodTypeParameters2() throws Exception { - performVariablesTest("package test; public class Test { private String aa(int a, int b) { a = b; b = a;} }", - "$mods$ <$tp$> $ret $name($args$) { $body$; }", - new Pair[] { - new Pair("$ret", new int[] {49, 55}), - new Pair("$mods$", new int[] {34, 41}), - }, - new Pair[] { - new Pair("$tp$", new int[] {43, 44, 46, 47}), - new Pair("$args$", new int[] {59, 64, 66, 71}), - new Pair("$body$", new int[] {75, 81, 82, 88}), - }, - new Pair[] { - new Pair("$name", "aa") - }, - false, - true); - } - - public void testMethodTypeParameters3() throws Exception { - performVariablesTest("package test; public class Test { private String aa(int a, int b) { a = b; b = a;} }", - "$mods$ <$tp> $ret $name($args$) { $body$; }", - new Pair[] { - new Pair("$ret", new int[] {46, 52}), - new Pair("$mods$", new int[] {34, 41}), - new Pair("$tp", new int[] {43, 44}), - }, - new Pair[] { - new Pair("$args$", new int[] {56, 61, 63, 68}), - new Pair("$body$", new int[] {72, 78, 79, 85}), - }, - new Pair[] { - new Pair("$name", "aa") - }, - false, - true); - } - - public void testTypeParameters1() throws Exception { - performVariablesTest("package test; public class Test { private void aa() { } }", - "$mods$ <$tp extends $bound&$obounds$> $ret $name($args$) { $body$; }", - new Pair[] { - new Pair("$ret", new int[] {61, 65}), - new Pair("$mods$", new int[] {34, 41}), - new Pair("$tp", new int[] {43, 59}), - new Pair("$bound", new int[] {53, 59}), - }, - new Pair[] { - new Pair("$obounds$", new int[] {}), - }, - new Pair[] { - new Pair("$name", "aa"), - new Pair("$tp", "A") - }, - false, - true); - } - - public void testPartialModifiers1() throws Exception { - performVariablesTest("package test; public class Test { @Deprecated @Override private void aa() { } }", - "$mods$ @Deprecated private $ret $name() { $body$; }", - new Pair[] { - new Pair("$ret", new int[] {64, 68}), - new Pair("$mods$", new int[] {34, 63}), - }, - new Pair[] { - }, - new Pair[] { - new Pair("$name", "aa"), - }, - false, - true); - } - - public void testPartialModifiers2() throws Exception { - performVariablesTest("package test; public class Test { @Override private void aa() { } }", - "$mods$ @Deprecated private $ret $name() { $body$; }", - new Pair[0], - new Pair[0], - new Pair[0], - true, - true); - } - - public void testNonStaticInnerClassesMatch() throws Exception { - performVariablesTest("package test; import test.Test.Inner; public class Test { public class Inner { } } class Other { { Inner i = null; } }", - "test.Test.Inner $i = $init$;", - new Pair[] { - new Pair("$i", new int[] {99, 114}), - new Pair("$init$", new int[] {109, 113}) - }, - new Pair[0], - new Pair[] { - new Pair("$i", "i") - }, - false, - true); - } - - public void testNewClassTypeParams222066a() throws Exception { - performVariablesTest("package test; public class Test { private Object aa() { return new java.util.ArrayList(1); } }", - "new java.util.ArrayList<$whatever$>($param)", - new Pair[] { - new Pair("$param", new int[] {87, 88}) - }, - new Pair[] { - new Pair("$whatever$", new int[0]) - }, - new Pair[0], - false, - false); - } - - public void testNewClassTypeParams222066b() throws Exception { - performVariablesTest("package test; import java.util.ArrayList; public class Test { private Object aa() { return new ArrayList(1); } }", - "new java.util.ArrayList<$whatever$>($param)", - new Pair[] { - new Pair("$param", new int[] {105, 106}) - }, - new Pair[] { - new Pair("$whatever$", new int[0]) - }, - new Pair[0], - false, - false); - } - - public void testFindLambda() throws Exception { - performVariablesTest("package test; import java.util.Comparator; public class Test { private void aa() { Comparator c = (l, r) -> l.compareTo(r); } }", - "($args$) -> $expression", - new Pair[] { - new Pair("$expression", new int[] {116, 130}) - }, - new Pair[] { - new Pair("$args$", new int[] {107, 108, 110, 111}) - }, - new Pair[0], - false, - false); - } - - public void testAnnotation1() throws Exception { - performVariablesTest("package test; import test.Test.A; @A(i=1) public class Test { @interface A { public int i(); } }", - "@$annotation($args$)", - new Pair[] { - new Pair("$annotation", new int[] {35, 36}) - }, - new Pair[] { - new Pair("$args$", new int[] {37, 40}) - }, - new Pair[0], - false, - true); - } - - public void testAnnotation2() throws Exception { - performVariablesTest("package test; import test.Test.A; @A(i=1,b=true,l=2) public class Test { @interface A { public int i(); public boolean b(); public long l(); } }", - "@test.Test.A($prefix$, b=$value, $suffix$)", - new Pair[] { - new Pair("$value", new int[] {43, 47}) - }, - new Pair[] { - new Pair("$prefix$", new int[] {37, 40}), - new Pair("$suffix$", new int[] {48, 51}) - }, - new Pair[0], - false, - false); - } - - protected void prepareTest(String code) throws Exception { - prepareTest(code, -1); - } - - protected void prepareTest(String code, int testIndex) throws Exception { - File workDirWithIndexFile = testIndex != (-1) ? new File(getWorkDir(), Integer.toString(testIndex)) : getWorkDir(); - FileObject workDirWithIndex = FileUtil.toFileObject(workDirWithIndexFile); - - if (workDirWithIndex != null) { - workDirWithIndex.delete(); - } - - workDirWithIndex = FileUtil.createFolder(workDirWithIndexFile); - - assertNotNull(workDirWithIndexFile); - - FileObject sourceRoot = workDirWithIndex.createFolder("src"); - FileObject buildRoot = workDirWithIndex.createFolder("build"); - FileObject cache = workDirWithIndex.createFolder("cache"); - - FileObject data = FileUtil.createData(sourceRoot, "test/Test.java"); - - TestUtilities.copyStringToFile(data, code); - - data.refresh(); - - SourceUtilsTestUtil.prepareTest(sourceRoot, buildRoot, cache); - - DataObject od = DataObject.find(data); - EditorCookie ec = od.getLookup().lookup(EditorCookie.class); - - assertNotNull(ec); - - doc = ec.openDocument(); - - doc.putProperty(Language.class, JavaTokenId.language()); - doc.putProperty("mimeType", "text/x-java"); - - JavaSource js = JavaSource.forFileObject(data); - - assertNotNull(js); - - info = SourceUtilsTestUtil.getCompilationInfo(js, Phase.RESOLVED); - - assertNotNull(info); - } - - private static String findRegions(String code, List regions) { - String[] split = code.split("\\|"); - StringBuilder filtered = new StringBuilder(); - - filtered.append(split[0]); - - int offset = split[0].length(); - - for (int cntr = 1; cntr < split.length; cntr += 2) { - int[] i = new int[] { - offset, - offset + split[cntr].length() - }; - - regions.add(i); - - filtered.append(split[cntr]); - filtered.append(split[cntr + 1]); - - offset += split[cntr].length(); - offset += split[cntr + 1].length(); - } - - return filtered.toString(); - } - - protected CompilationInfo info; - private Document doc; - - private void performTest(String code) throws Exception { - performTest(code, true); - } - - private void performTest(String code, boolean verify) throws Exception { - List result = new LinkedList(); - - code = findRegions(code, result); - - int testIndex = 0; - - for (int[] i : result) { - int[] duplicates = new int[2 * (result.size() - 1)]; - int cntr = 0; - List l = new LinkedList(result); - - l.remove(i); - - for (int[] span : l) { - duplicates[cntr++] = span[0]; - duplicates[cntr++] = span[1]; - } - - doPerformTest(code, i[0], i[1], testIndex++, verify, duplicates); - } - } - - protected void performTest(String code, int start, int end, int... duplicates) throws Exception { - doPerformTest(code, start, end, -1, true, duplicates); - } - - protected void doPerformTest(String code, int start, int end, int testIndex, int... duplicates) throws Exception { - doPerformTest(code, start, end, testIndex, true, duplicates); - } - - protected void doPerformTest(String code, int start, int end, int testIndex, boolean verify, int... duplicates) throws Exception { - prepareTest(code, testIndex); - - TreePath path = info.getTreeUtilities().pathFor((start + end) / 2 + 1); - - while (path != null) { - Tree t = path.getLeaf(); - SourcePositions sp = info.getTrees().getSourcePositions(); - - if ( start == sp.getStartPosition(info.getCompilationUnit(), t) - && end == sp.getEndPosition(info.getCompilationUnit(), t)) { - break; - } - - path = path.getParentPath(); - } - - assertNotNull(path); - - Collection result = computeDuplicates(path); - - // assertEquals(f.result.toString(), duplicates.length / 2, f.result.size()); - - if (verify) { - int[] dupes = new int[result.size() * 2]; - int index = 0; - - for (TreePath tp : result) { - dupes[index++] = (int) info.getTrees().getSourcePositions().getStartPosition(info.getCompilationUnit(), tp.getLeaf()); - dupes[index++] = (int) info.getTrees().getSourcePositions().getEndPosition(info.getCompilationUnit(), tp.getLeaf()); - } - - assertTrue("Was: " + Arrays.toString(dupes) + " should have been: " + Arrays.toString(duplicates), Arrays.equals(duplicates, dupes)); - } - } - - protected void performVariablesTest(String code, String pattern, Pair[] duplicatesPos, Pair[] duplicatesNames) throws Exception { - performVariablesTest(code, pattern, duplicatesPos, new Pair[0], duplicatesNames); - } - - protected void performVariablesTest(String code, String pattern, Pair[] duplicatesPos, Pair[] multiStatementPos, Pair[] duplicatesNames) throws Exception { - performVariablesTest(code, pattern, duplicatesPos, multiStatementPos, duplicatesNames, false); - } - - protected void performVariablesTest(String code, String pattern, Pair[] duplicatesPos, Pair[] multiStatementPos, Pair[] duplicatesNames, boolean noOccurrences) throws Exception { - performVariablesTest(code, pattern, duplicatesPos, multiStatementPos, duplicatesNames, noOccurrences, false); - } - - protected void performVariablesTest(String code, String pattern, Pair[] duplicatesPos, Pair[] multiStatementPos, Pair[] duplicatesNames, boolean noOccurrences, boolean useBulkSearch) throws Exception { - prepareTest(code, -1); - - Map constraints = new HashMap(); - String patternCode = PatternCompilerUtilities.parseOutTypesFromPattern(info, pattern, constraints); - - Pattern patternObj = PatternCompiler.compile(info, patternCode, constraints, Collections.emptyList()); - TreePath patternPath = MatchingTestAccessor.getPattern(patternObj).iterator().next(); - Map result; - - if (useBulkSearch) { - result = new HashMap(); - - BulkPattern bulkPattern = BulkSearch.getDefault().create(info, new AtomicBoolean(), patternCode); - - for (Entry> e : BulkSearch.getDefault().match(info, new AtomicBoolean(), new TreePath(info.getCompilationUnit()), bulkPattern).entrySet()) { - for (TreePath tp : e.getValue()) { - VariableAssignments vars = computeVariables(info, patternPath, tp, new AtomicBoolean(), MatchingTestAccessor.getVariable2Type(patternObj)); - - if (vars != null) { - result.put(tp, vars); - } - } - } - } else { - result = computeDuplicates(info, patternPath, new TreePath( info.getCompilationUnit()), new AtomicBoolean(), MatchingTestAccessor.getVariable2Type(patternObj)); - } - - if (noOccurrences) { - assertEquals(0, result.size()); - return ; - } - - assertSame(1, result.size()); - - Map actual = new HashMap(); - - for (Entry e : result.values().iterator().next().variables.entrySet()) { - int[] span = new int[] { - (int) info.getTrees().getSourcePositions().getStartPosition(info.getCompilationUnit(), e.getValue().getLeaf()), - (int) info.getTrees().getSourcePositions().getEndPosition(info.getCompilationUnit(), e.getValue().getLeaf()) - }; - - actual.put(e.getKey(), span); - } - - for (Pair dup : duplicatesPos) { - int[] span = actual.remove(dup.getA()); - - if (span == null) { - fail(dup.getA()); - } - assertTrue(dup.getA() + ":" + Arrays.toString(span), Arrays.equals(span, dup.getB())); - } - - Map actualMulti = new HashMap(); - - for (Entry> e : result.values().iterator().next().multiVariables.entrySet()) { - int[] span = new int[2 * e.getValue().size()]; - int i = 0; - - for (TreePath tp : e.getValue()) { - span[i++] = (int) info.getTrees().getSourcePositions().getStartPosition(info.getCompilationUnit(), tp.getLeaf()); - span[i++] = (int) info.getTrees().getSourcePositions().getEndPosition(info.getCompilationUnit(), tp.getLeaf()); - } - - actualMulti.put(e.getKey(), span); - } - - for (Pair dup : multiStatementPos) { - int[] span = actualMulti.remove(dup.getA()); - - if (span == null) { - fail(dup.getA()); - } - assertTrue(dup.getA() + ":" + Arrays.toString(span), Arrays.equals(span, dup.getB())); - } - - Map golden = new HashMap(); - - for ( Pair e : duplicatesNames) { - golden.put(e.getA(), e.getB()); - } - - assertEquals(golden, result.values().iterator().next().variables2Names); - } - - protected VariableAssignments computeVariables(CompilationInfo info, TreePath searchingFor, TreePath scope, AtomicBoolean cancel, Map designedTypeHack) { - Collection values = CopyFinder.internalComputeDuplicates(info, Collections.singletonList(searchingFor), scope, null, null, new AtomicBooleanCancel(cancel), designedTypeHack, Options.ALLOW_VARIABLES_IN_PATTERN).values(); - - if (values.iterator().hasNext()) { - return values.iterator().next(); - } else { - return null; - } - } - - protected Map computeDuplicates(CompilationInfo info, TreePath searchingFor, TreePath scope, AtomicBoolean cancel, Map designedTypeHack) { - return CopyFinder.internalComputeDuplicates(info, Collections.singletonList(searchingFor), scope, null, null, new AtomicBooleanCancel(cancel), designedTypeHack, Options.ALLOW_VARIABLES_IN_PATTERN, Options.ALLOW_GO_DEEPER); - } - - private void performRemappingTest(String code, String remappableVariables, Options... options) throws Exception { - List regions = new LinkedList(); - - code = findRegions(code, regions); - - prepareTest(code, -1); - - int[] statements = new int[2]; - - int[] currentRegion = regions.get(0); - TreePathHandle tph = IntroduceMethodFix.validateSelectionForIntroduceMethod(info, currentRegion[0], currentRegion[1], statements); - - assertNotNull(tph); - - TreePath tp = tph.resolve(info); - - assertNotNull(tp); - - BlockTree bt = (BlockTree) tp.getParentPath().getLeaf(); - List searchFor = new LinkedList(); - - for (StatementTree t : bt.getStatements().subList(statements[0], statements[1] + 1)) { - searchFor.add(new TreePath(tp, t)); - } - - final Set vars = new HashSet(); - - for (final String name : remappableVariables.split(",")) { - if (name.isEmpty()) continue; - new TreePathScanner() { - @Override - public Object visitVariable(VariableTree node, Object p) { - if (node.getName().contentEquals(name)) { - vars.add((VariableElement) info.getTrees().getElement(getCurrentPath())); - } - - return super.visitVariable(node, p); - } - }.scan(info.getCompilationUnit(), null); - } - - Set opts = EnumSet.of(Options.ALLOW_GO_DEEPER); - - opts.addAll(Arrays.asList(options)); - - Map result = CopyFinder.internalComputeDuplicates(info, searchFor, new TreePath(info.getCompilationUnit()), null, vars, new AtomicBooleanCancel(), Collections.emptyMap(), opts.toArray(new Options[0])); - Set> realSpans = new HashSet>(); - - for (Entry e : result.entrySet()) { - List parentStatements = CopyFinder.getStatements(e.getKey()); - int dupeStart = parentStatements.indexOf(e.getKey().getLeaf()); - int startPos = (int) info.getTrees().getSourcePositions().getStartPosition(info.getCompilationUnit(), parentStatements.get(dupeStart)); - int endPos = (int) info.getTrees().getSourcePositions().getEndPosition(info.getCompilationUnit(), parentStatements.get(dupeStart + searchFor.size() - 1)); - - realSpans.add(Arrays.asList(startPos, endPos)); - } - - Set> goldenSpans = new HashSet>(); - - for (int[] region : regions) { - if (region == currentRegion) continue; - - int[] stmts = new int[2]; - TreePathHandle gtph = IntroduceMethodFix.validateSelectionForIntroduceMethod(info, region[0], region[1], stmts); - - assertNotNull(gtph); - - TreePath gtp = gtph.resolve(info); - - assertNotNull(gtp); - - BlockTree b = (BlockTree) gtp.getParentPath().getLeaf(); - - int startPos = (int) info.getTrees().getSourcePositions().getStartPosition(info.getCompilationUnit(), b.getStatements().get(stmts[0])); - int endPos = (int) info.getTrees().getSourcePositions().getEndPosition(info.getCompilationUnit(), b.getStatements().get(stmts[1])); - - goldenSpans.add(Arrays.asList(startPos, endPos)); - } - - assertEquals(goldenSpans, realSpans); - } - - protected Collection computeDuplicates(TreePath path) { - return CopyFinder.internalComputeDuplicates(info, Collections.singletonList(path), new TreePath(info.getCompilationUnit()), null, null, new AtomicBooleanCancel(), null, Options.ALLOW_GO_DEEPER).keySet(); - } - - public static final class Pair { - private final A a; - private final B b; - - public Pair(A a, B b) { - this.a = a; - this.b = b; - } - - public A getA() { - return a; - } - - public B getB() { - return b; - } - - } - - private static final class AtomicBooleanCancel implements Cancel { - - private final AtomicBoolean cancel; - - public AtomicBooleanCancel() { - this(new AtomicBoolean()); - } - - public AtomicBooleanCancel(AtomicBoolean cancel) { - this.cancel = cancel; - } - - @Override - public boolean isCancelled() { - return cancel.get(); - } - - } -} diff -r 205b7632914c -r 57843026e60b sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/support/FixFactoryTest.java --- a/sandbox/java.hints/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/support/FixFactoryTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2013 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2013 Sun Microsystems, Inc. - */ -package org.netbeans.spi.java.hints.support; - -import com.sun.source.tree.ClassTree; -import com.sun.source.util.TreePath; -import java.util.EnumSet; -import javax.lang.model.element.Modifier; -import org.netbeans.api.java.source.SourceUtilsTestUtil; -import org.netbeans.modules.java.hints.spiimpl.TestBase; -import org.openide.LifecycleManager; - -/** - * - * @author lahvac - */ -public class FixFactoryTest extends TestBase { - - public FixFactoryTest(String name) { - super(name); - } - - @Override - protected void setUp() throws Exception { - super.setUp(); - SourceUtilsTestUtil.makeScratchDir(this); - } - - public void testInterfaceModifiers() throws Exception { - prepareTest("test/Test.java", "package test; public interface I { }"); - - ClassTree i = (ClassTree) info.getCompilationUnit().getTypeDecls().get(0); - - FixFactory.removeModifiersFix(info, TreePath.getPath(info.getCompilationUnit(), i.getModifiers()), EnumSet.of(Modifier.PUBLIC), "").implement(); - - LifecycleManager.getDefault().saveAll(); - - assertEquals("package test; interface I { }", info.getFileObject().asText()); - } -} \ No newline at end of file diff -r 205b7632914c -r 57843026e60b sandbox/nb-scripts/jackpot-to-nb --- a/sandbox/nb-scripts/jackpot-to-nb Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -#!/bin/bash - -. nb-jackpot-lib - -convert $JACKPOT $NETBEANS diff -r 205b7632914c -r 57843026e60b sandbox/nb-scripts/nb-jackpot-lib --- a/sandbox/nb-scripts/nb-jackpot-lib Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -NETBEANS=1 -JACKPOT=2 - -function convert() { - MAPPING=`dirname $0i`/nb-to-jackpot.mapping; - SCRIPT=/tmp/$$.sed - rm -rf $SCRIPT - - for map in `cat $MAPPING`; do - echo -n "s/" >>$SCRIPT - FROM_PATH=`echo -n $map | cut -d ':' -f $1`; - TO_PATH=`echo -n $map | cut -d ':' -f $2`; - echo -n "$FROM_PATH" | sed -e "s/\//\\\\\//g" >>$SCRIPT - echo -n "/" >>$SCRIPT - echo -n "$TO_PATH" | sed -e "s/\//\\\\\//g" >>$SCRIPT - echo "/g" >>$SCRIPT - done - -#cat $SCRIPT -sed -f $SCRIPT -} diff -r 205b7632914c -r 57843026e60b sandbox/nb-scripts/nb-to-jackpot --- a/sandbox/nb-scripts/nb-to-jackpot Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -#!/bin/bash - -. `dirname $0`/nb-jackpot-lib - -convert $NETBEANS $JACKPOT diff -r 205b7632914c -r 57843026e60b sandbox/nb-scripts/nb-to-jackpot.mapping --- a/sandbox/nb-scripts/nb-to-jackpot.mapping Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -java.hints/src/org/netbeans/modules/java/hints/introduce/CopyFinder.java:api/src/org/netbeans/modules/jackpot30/impl/pm/CopyFinder.java -java.hints/test/unit/src/org/netbeans/modules/java/hints/introduce/CopyFinderTest.java:borrowedtests/src/org/netbeans/modules/java/hints/introduce/CopyFinderTest.java -java.hints/src/org/netbeans/modules/java/hints/jackpot/file:file/src/org/netbeans/modules/jackpot30/file -java.hints/src/org/netbeans/modules/java/hints/jackpot/impl:api/src/org/netbeans/modules/jackpot30/impl -java.hints/src/org/netbeans/modules/java/hints/jackpot/spi:api/src/org/netbeans/modules/jackpot30/spi -java.hints/test/unit/src/org/netbeans/modules/java/hints/jackpot/file:file/test/unit/src/org/netbeans/modules/jackpot30/file -java.hints/test/unit/src/org/netbeans/modules/java/hints/jackpot/impl/pm:api/test/unit/src/org/netbeans/modules/jackpot30/impl/pm -java.hints/test/unit/src/org/netbeans/modules/java/hints/jackpot/impl:api/test/unit/src/org/netbeans/modules/jackpot30/impl -java.hints/test/unit/src/org/netbeans/modules/java/hints/jackpot/spi:api/test/unit/src/org/netbeans/modules/jackpot30/spi diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/api/build.xml --- a/sandbox/old-modules/api/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - - - - Builds, tests, and runs the project org.netbeans.modules.jackpot30.api. - - - - - - - - - - - - - - - - - diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/api/manifest.mf --- a/sandbox/old-modules/api/manifest.mf Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -Manifest-Version: 1.0 -AutoUpdate-Show-In-Client: false -OpenIDE-Module: org.netbeans.modules.jackpot30.api -OpenIDE-Module-Implementation-Version: 1 -OpenIDE-Module-Layer: org/netbeans/modules/jackpot30/impl/resources/layer.xml -OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jackpot30/impl/resources/Bundle.properties - diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/api/nbproject/build-impl.xml --- a/sandbox/old-modules/api/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/api/nbproject/genfiles.properties --- a/sandbox/old-modules/api/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -build.xml.data.CRC32=f9c1509c -build.xml.script.CRC32=0abcaef9 -build.xml.stylesheet.CRC32=79c3b980@1.28.0.7 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=6500fcd0 -nbproject/build-impl.xml.script.CRC32=ff50c613 -nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.70 diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/api/nbproject/project.properties --- a/sandbox/old-modules/api/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -javac.source=1.5 -javac.compilerargs=-Xlint -Xlint:-serial -spec.version.base=1.16.0 diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/api/nbproject/project.xml --- a/sandbox/old-modules/api/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,437 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - org.netbeans.modules.jackpot30.api - - - - org.jdesktop.layout - - - - 1 - 1.7.0.103 - - - - org.netbeans.api.annotations.common - - - - 1 - 1.0 - - - - org.netbeans.api.java.classpath - - - - 1 - 1.19 - - - - org.netbeans.api.progress - - - - 1 - 1.13.0.1 - - - - org.netbeans.libs.javacapi - - - - 7.5.0.3 - - - - org.netbeans.libs.javacimpl - - - - 1 - - - - - org.netbeans.libs.lucene - - - - 1-3 - 2.13 - - - - org.netbeans.modules.diff - - - - 1 - - - - - org.netbeans.modules.editor - - - - 3 - 1.56.0.5.13.6 - - - - org.netbeans.modules.editor.lib - - - - 1-3 - 1.38.0.9.2 - - - - org.netbeans.modules.editor.lib2 - - - - 1 - 1.13.0.2 - - - - org.netbeans.modules.editor.mimelookup - - - - 1 - 1.12 - - - - org.netbeans.modules.editor.settings - - - - 1 - 1.25 - - - - org.netbeans.modules.jackpot30.remoting.api - - - - 1.0 - - - - org.netbeans.modules.java.editor - - - - 1 - - - - - org.netbeans.modules.java.hints - - - - 1 - - - - - org.netbeans.modules.java.lexer - - - - 1 - 1.9 - - - - org.netbeans.modules.java.platform - - - - 1 - 1.12 - - - - org.netbeans.modules.java.preprocessorbridge - - - - - - - - org.netbeans.modules.java.source - - - - - - - - org.netbeans.modules.lexer - - - - 2 - 1.34 - - - - org.netbeans.modules.options.api - - - - 1 - 1.20 - - - - org.netbeans.modules.parsing.api - - - - 1 - - - - - org.netbeans.modules.projectapi - - - - 1 - 1.24 - - - - org.netbeans.modules.projectuiapi - - - - 1 - 1.35.0.6 - - - - org.netbeans.modules.queries - - - - 1 - 1.15 - - - - org.netbeans.modules.refactoring.api - - - - 1.6 - - - - org.netbeans.modules.refactoring.java - - - - 1 - 1.6 - - - - org.netbeans.modules.sendopts - - - - 2 - 2.4 - - - - org.netbeans.spi.editor.hints - - - - 0-1 - 1.7.0.7.2 - - - - org.openide.awt - - - - 7.7.0.1 - - - - org.openide.dialogs - - - - 7.10 - - - - org.openide.filesystems - - - - 7.21.0.1.1 - - - - org.openide.loaders - - - - 7.5 - - - - org.openide.modules - - - - 7.10 - - - - org.openide.nodes - - - - 7.9.0.1 - - - - org.openide.text - - - - 6.22 - - - - org.openide.util - - - - 8.0 - - - - org.openide.util.lookup - - - - 8.0.0.1 - - - - org.openide.windows - - - - 6.27 - - - - - - unit - - org.netbeans.bootstrap - - - org.netbeans.core.startup - - - org.netbeans.insane - - - - org.netbeans.libs.junit4 - - - - org.netbeans.modules.classfile - - - org.netbeans.modules.defaults - - - org.netbeans.modules.editor - - - org.netbeans.modules.editor.mimelookup - - - org.netbeans.modules.editor.settings - - - org.netbeans.modules.editor.settings.storage - - - org.netbeans.modules.editor.util - - - org.netbeans.modules.jackpot30.common.test - - - - org.netbeans.modules.jackpot30.test.borrowed - - - - - org.netbeans.modules.java.hints - - - - org.netbeans.modules.java.hints.declarative - - - org.netbeans.modules.java.lexer - - - org.netbeans.modules.masterfs - - - org.netbeans.modules.nbjunit - - - - org.netbeans.modules.progress.ui - - - org.netbeans.modules.projectui - - - org.openidex.util - - - - - org.netbeans.modules.jackpot30.spi - org.netbeans.modules.jackpot30.spi.refactoring - org.netbeans.modules.jackpot30.spi.support - - - - diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/api/nbproject/suite.properties --- a/sandbox/old-modules/api/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/api/src/org/netbeans/modules/jackpot30/impl/examples/Bundle.properties --- a/sandbox/old-modules/api/src/org/netbeans/modules/jackpot30/impl/examples/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# -# Portions Copyrighted 2010 Sun Microsystems, Inc. - -double-checked-locking=Double Checked Locking -double-checked-locking-verify=Double Checked Locking Strict -double-checked-locking-fix=Double Checked Locking -new-string=New String Creation -lambda-candidate=Find candidates for Lambda expression -ExamplesList.pattern.contentType=text/x-javahints diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/api/src/org/netbeans/modules/jackpot30/impl/examples/Example.java --- a/sandbox/old-modules/api/src/org/netbeans/modules/jackpot30/impl/examples/Example.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2010 Oracle and/or its affiliates. All rights reserved. - * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2010 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.jackpot30.impl.examples; - -import java.util.Set; -import org.openide.util.NbBundle; - -/** - * - * @author lahvac - */ -public class Example { - - private final String key; - private final String code; - private final Set
    - <#list results as result> -
    ${result.relativePath}show
    -
    -
    - -
    - - -<#if statistics??> - Query time: ${statistics.queryTime}ms, matching files: ${statistics.files}. - - - diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/server/web.api/src/org/netbeans/modules/jackpot30/server/webapi/ui-snippet.html --- a/sandbox/old-modules/server/web.api/src/org/netbeans/modules/jackpot30/server/webapi/ui-snippet.html Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -<#if snippets??> - <#list snippets as snippet> - 
    ${snippet.prefix}${snippet.occurrence}${snippet.suffix}

    - -<#else> - No occurrences. - diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/server/web.api/test/org/netbeans/modules/jackpot30/server/webapi/APITest.java --- a/sandbox/old-modules/server/web.api/test/org/netbeans/modules/jackpot30/server/webapi/APITest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,107 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.jackpot30.server.webapi; - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.InputStream; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.netbeans.modules.jackpot30.impl.indexing.Cache; -import org.netbeans.modules.jackpot30.server.indexer.StandaloneIndexer; - -/** - * - * @author lahvac - */ -public class APITest { - - public APITest() { - } - - private File src; - - @Before - public void setUp() throws Exception { - File source = new File(APITest.class.getProtectionDomain().getCodeSource().getLocation().getPath()); - File workingDirectory = new File(source.getParentFile(), "wd"); - File cache = new File(workingDirectory, "cache"); - - src = new File(workingDirectory, "src"); - - Cache.setStandaloneCacheRoot(cache); - - copyStringToFile(new File(src, "test/Test1.java"), "package test; public class Test {private void test() { new java.io.File(\"\").isDirectory(); } }"); - - StandaloneIndexer.index(src, false, false, null, null); - } - - public final static void copyStringToFile (File f, String content) throws Exception { - f.getParentFile().mkdirs(); - - FileOutputStream os = new FileOutputStream(f); - InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8")); - int read; - while ((read = is.read()) != (-1)) { - os.write(read); - } - os.close (); - is.close(); - } - - @Test - public void testFind() throws Exception { - String cacheKey = null; - - for (String key : Cache.knownSourceRoots()) { - if (src.getAbsolutePath().equals(Cache.sourceRootForKey(key).getAbsolutePath())) { - cacheKey = key; - break; - } - } - - Assert.assertNotNull(cacheKey); - - Assert.assertEquals("test/Test1.java\n", new API().find(cacheKey, "$1.isDirectory()")); - } - -} \ No newline at end of file diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/build.xml --- a/sandbox/old-modules/transformer/build.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ - - - - - - Builds, tests, and runs the project org.netbeans.modules.jackpot30.transformers. - - - diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/manifest.mf --- a/sandbox/old-modules/transformer/manifest.mf Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -Manifest-Version: 1.0 -AutoUpdate-Show-In-Client: false -OpenIDE-Module: org.netbeans.modules.jackpot30.transformers -OpenIDE-Module-Layer: org/netbeans/modules/jackpot30/transformers/resources/layer.xml -OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jackpot30/transformers/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 1.16 - diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/nbproject/build-impl.xml --- a/sandbox/old-modules/transformer/nbproject/build-impl.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/nbproject/genfiles.properties --- a/sandbox/old-modules/transformer/nbproject/genfiles.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -build.xml.data.CRC32=ec1a83f8 -build.xml.script.CRC32=14b2fe09 -build.xml.stylesheet.CRC32=79c3b980@1.28.0.7 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=9e6fb388 -nbproject/build-impl.xml.script.CRC32=99a123ad -nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.70 diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/nbproject/project.properties --- a/sandbox/old-modules/transformer/nbproject/project.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -javac.source=1.5 -javac.compilerargs=-Xlint -Xlint:-serial diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/nbproject/project.xml --- a/sandbox/old-modules/transformer/nbproject/project.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,157 +0,0 @@ - - - org.netbeans.modules.apisupport.project - - - org.netbeans.modules.jackpot30.transformers - - - - org.netbeans.api.java.classpath - - - - 1 - 1.19 - - - - org.netbeans.libs.javacapi - - - - 0.8.0.1 - - - - org.netbeans.modules.jackpot30.api - - - - 1.0 - - - - org.netbeans.modules.java.hints - - - - 1 - - - - - org.netbeans.modules.java.source - - - - 0.43.0.7.7.1 - - - - org.netbeans.spi.editor.hints - - - - 0-1 - 1.7.0.7.2 - - - - org.openide.filesystems - - - - 7.21.0.1.1 - - - - org.openide.modules - - - - 7.10 - - - - org.openide.util - - - - 7.22.0.1 - - - - org.openide.util.lookup - - - - 8.0.0.1 - - - - - - unit - - org.netbeans.bootstrap - - - org.netbeans.core.startup - - - org.netbeans.libs.junit4 - - - - org.netbeans.modules.classfile - - - org.netbeans.modules.defaults - - - org.netbeans.modules.editor - - - org.netbeans.modules.editor.mimelookup - - - org.netbeans.modules.editor.settings - - - org.netbeans.modules.editor.settings.storage - - - org.netbeans.modules.editor.util - - - org.netbeans.modules.jackpot30.test.borrowed - - - - - org.netbeans.modules.java.lexer - - - org.netbeans.modules.masterfs - - - org.netbeans.modules.nbjunit - - - - - org.netbeans.modules.progress.ui - - - org.netbeans.modules.projectui - - - org.openidex.util - - - - - - - diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/nbproject/suite.properties --- a/sandbox/old-modules/transformer/nbproject/suite.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -suite.dir=${basedir}/.. diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/release/libs/annotations.jar Binary file sandbox/old-modules/transformer/release/libs/annotations.jar has changed diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/src/org/netbeans/modules/jackpot30/transformers/Annotations.java --- a/sandbox/old-modules/transformer/src/org/netbeans/modules/jackpot30/transformers/Annotations.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.jackpot30.transformers; - -/** - * - * @author Jan Lahoda - */ -public enum Annotations { - - TRANSFORMATION_SET("TransformationSet"), - TRANSFORMATION, - FIX, - PATTERN, - CONSTRAINT; - - private static final String PACKAGE_NAME = "net.java.lang.annotations."; - - private final String specialName; - - private Annotations() { - this(null); - } - - private Annotations(String specialName) { - this.specialName = specialName; - } - - public String toFQN() { - return PACKAGE_NAME + (specialName != null ? specialName : name().charAt(0) + name().substring(1).toLowerCase()); - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/src/org/netbeans/modules/jackpot30/transformers/TransformationHintProviderImpl.java --- a/sandbox/old-modules/transformer/src/org/netbeans/modules/jackpot30/transformers/TransformationHintProviderImpl.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,508 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced bysanno - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.jackpot30.transformers; - -import org.netbeans.modules.java.hints.jackpot.spi.Trigger.PatternDescription; -import org.netbeans.modules.java.hints.spi.AbstractHint.HintSeverity; -import org.netbeans.modules.java.hints.jackpot.spi.support.ErrorDescriptionFactory; -import org.netbeans.modules.java.hints.jackpot.spi.ElementBasedHintProvider; -import org.netbeans.modules.java.hints.jackpot.spi.HintContext; -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription; -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription.Worker; -import org.netbeans.modules.java.hints.jackpot.spi.HintDescriptionFactory; -import org.netbeans.modules.java.hints.jackpot.spi.HintMetadata; -import org.netbeans.modules.java.hints.jackpot.spi.JavaFix; -import com.sun.source.tree.Tree; -import com.sun.source.util.SourcePositions; -import com.sun.source.util.TreePath; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.regex.Matcher; -import javax.lang.model.element.AnnotationMirror; -import javax.lang.model.element.AnnotationValue; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.PackageElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.ElementFilter; -import org.netbeans.api.java.classpath.ClassPath; -import org.netbeans.api.java.source.ClasspathInfo; -import org.netbeans.api.java.source.ClasspathInfo.PathKind; -import org.netbeans.api.java.source.CompilationController; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.ElementHandle; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.Task; -import org.netbeans.api.java.source.TypeMirrorHandle; -import org.netbeans.api.java.source.support.CancellableTreePathScanner; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.editor.hints.Fix; -import org.netbeans.spi.java.classpath.support.ClassPathSupport; -import org.openide.filesystems.FileUtil; -import org.openide.modules.InstalledFileLocator; -import org.openide.util.Exceptions; - -import org.openide.util.lookup.ServiceProvider; -import static org.netbeans.modules.jackpot30.transformers.Annotations.*; - -/** - * - * @author Jan Lahoda - */ -@ServiceProvider(service=ElementBasedHintProvider.class) -public class TransformationHintProviderImpl implements ElementBasedHintProvider { - - private JavaSource prepareJavaSource(CompilationInfo info) { - ClasspathInfo currentCP = info.getClasspathInfo(); - ClassPath overlayCompileCP = prepareOverlayCompileCP(); - ClassPath extendedCompileCP = ClassPathSupport.createProxyClassPath(overlayCompileCP, currentCP.getClassPath(PathKind.COMPILE)); - ClassPath overlayBootCP = prepareOverlayBootCP(); - ClassPath extendedBootCP = ClassPathSupport.createProxyClassPath(overlayBootCP, currentCP.getClassPath(PathKind.BOOT)); - ClasspathInfo extendedCPInfo = ClasspathInfo.create(extendedBootCP, extendedCompileCP, currentCP.getClassPath(PathKind.SOURCE)); - - return JavaSource.create(extendedCPInfo); - } - - public Collection computeHints(final CompilationInfo info) { - final List hints = new LinkedList(); - - if (ANNOTATIONS_JAR != null && (JDK_OVERLAY_JAR != null || NB_OVERLAY_JAR != null)) { - try { - prepareJavaSource(info).runUserActionTask(new Task() { - public void run(final CompilationController overlayInfo) throws Exception { - List w = doComputeHints(info, overlayInfo); - - if (w != null) { - hints.addAll(w); - } - } - }, true); - } catch (IOException ex) { - Exceptions.printStackTrace(ex); - } - } else { - List w = doComputeHints(info, null); - - if (w != null) { - hints.addAll(w); - } - } - - return hints; - } - - private static final Set KINDS_FOR_ELEMENT_HANDLE = EnumSet.of( - ElementKind.PACKAGE, ElementKind.CLASS, ElementKind.INTERFACE, ElementKind.ENUM, - ElementKind.ANNOTATION_TYPE, ElementKind.METHOD, ElementKind.CONSTRUCTOR, - ElementKind.INSTANCE_INIT, ElementKind.STATIC_INIT, ElementKind.FIELD, - ElementKind.ENUM_CONSTANT); - - private List doComputeHints(CompilationInfo info, - CompilationInfo overlayInfo) { - - FindAnnotation ann = new FindAnnotation(info, overlayInfo, /*XXX*/new AtomicBoolean()); - - ann.scan(info.getCompilationUnit(), null); - - return ann.hints; - } - - private final class FindAnnotation extends CancellableTreePathScanner { - - private final CompilationInfo info; - private final CompilationInfo overlayInfo; - private final List hints = new LinkedList(); - - public FindAnnotation(CompilationInfo info, CompilationInfo overlayInfo, AtomicBoolean cancel) { - super(cancel); - this.info = info; - this.overlayInfo = overlayInfo; - } - - private final Set handledElements = new HashSet(); - - private void handleElementImpl(Element el) { - if (!handledElements.add(el)) return ; - - List currentHints = processAnnotations(el, el.getEnclosingElement(), info, info); - - if (overlayInfo != null && currentHints.isEmpty() && KINDS_FOR_ELEMENT_HANDLE.contains(el.getKind())) { - Element overlay = ElementHandle.create(el).resolve(overlayInfo); - - if (overlay != null) { - currentHints = processAnnotations(overlay, overlay.getEnclosingElement(), info, overlayInfo); - } - } - - this.hints.addAll(currentHints); - } - - private void handleElement(Element el) { - PackageElement p = info.getElements().getPackageOf(el); - - while (p != el) { - handleElementImpl(el); - el = el.getEnclosingElement(); - } - - handleElementImpl(p); - } - - @Override - public Void scan(Tree tree, Void p) { - if (tree == null) return null; - - TreePath tp = new TreePath(getCurrentPath(), tree); - Element el = info.getTrees().getElement(tp); - - if (el != null) { - handleElement(el); - } - - return super.scan(tree, p); - } - } - - private static final class WorkerImpl implements Worker { - - private final String displayName; - private final List fixDescriptions; - - public WorkerImpl(String displayName, List fixDescriptions) { - this.displayName = displayName; - this.fixDescriptions = fixDescriptions; - } - - public Collection createErrors(HintContext ctx) { - //XXX: antipatterns not supported by the current infrastructure -// TreePath tp = treePath; -// -// while (tp != null) { -// if (!pd.getPattern().checkAntipatterns(tp)) { -// return null; -// } -// -// tp = tp.getParentPath(); -// } - - List fixes = new LinkedList(); - - for (FixDescription d : fixDescriptions) { - String dn = d.getDisplayName(); - - if (dn.length() == 0) { - dn = defaultFixDisplayName(ctx.getInfo(), ctx.getVariables(), d); - } - - fixes.add(JavaFix.rewriteFix(ctx.getInfo(), dn, ctx.getPath(), d.getPattern(), ctx.getVariables(), ctx.getMultiVariables(), ctx.getVariableNames(), Collections.emptyMap()/*XXX: pd.pattern.getConstraints()*/)); - } - - return Collections.singletonList(ErrorDescriptionFactory.forName(ctx, ctx.getPath(), displayName, fixes.toArray(new Fix[0]))); - } - } - - private static T findValue(AnnotationMirror m, String name, Class clazz) { - for (Entry e : m.getElementValues().entrySet()) { - if (name.equals(e.getKey().getSimpleName().toString())) { - return clazz.cast(e.getValue().getValue()); - } - } - - TypeElement te = (TypeElement) m.getAnnotationType().asElement(); - - for (ExecutableElement ee : ElementFilter.methodsIn(te.getEnclosedElements())) { - if (name.equals(ee.getSimpleName().toString())) { - if (ee.getDefaultValue() == null) { - return null; - } - return clazz.cast(ee.getDefaultValue().getValue()); - } - } - - return null; - } - - private static HintDescription create(CompilationInfo info, Element el, AnnotationMirror transformation, String id, CompilationInfo fake) { - Collection rawPatterns = findValue(transformation, "pattern", Collection.class); - - if (rawPatterns == null || rawPatterns.isEmpty()) { - return null; - } - - Iterable patterns = Utilities.checkedIterableByFilter(rawPatterns, AnnotationMirror.class, true); - - String patternString = findValue(patterns.iterator().next(), "value", String.class); - - if (patternString == null) { - return null; - } - - Collection rawConstraints = findValue(transformation, "constraint", Collection.class); - - if (rawConstraints == null) { - return null; - } - - Iterable constraints = Utilities.checkedIterableByFilter(rawConstraints, AnnotationMirror.class, true); - Map variableTypes = new HashMap(); - - for (AnnotationMirror m : constraints) { - String var = findValue(m, "variable", String.class); - TypeMirror tm = findValue(m, "type", TypeMirror.class); - - if (var == null || tm == null) { - return null; - } - - variableTypes.put(var, tm.toString()); //XXX: toString() - } - - if (!el.getModifiers().contains(Modifier.STATIC) && !variableTypes.containsKey("$this")) { - TypeMirror parent = el.getEnclosingElement().asType(); - - variableTypes.put("$this", TypeMirrorHandle.create(fake.getTypes().erasure(parent)).resolve(info).toString()); //XXX: toString() - } - - List aps = new LinkedList(); - - for (AnnotationMirror ap : Utilities.checkedIterableByFilter(findValue(transformation, "antipattern", Collection.class), AnnotationMirror.class, true)) { - aps.add(findValue(ap, "value", String.class)); - } - - List fixes = new LinkedList(); - Collection rawFixes = findValue(transformation, "fix", Collection.class); - - if (rawFixes == null) { - return null; - } - - for (AnnotationMirror f : Utilities.checkedIterableByFilter(rawFixes, AnnotationMirror.class, true)) { - String dn = findValue(f, "displayName", String.class); - String to = findValue(f, "value", String.class); - - if (dn == null || to == null) { - return null; - } - - fixes.add(new FixDescription(dn, to)); - } - - String displayName = findValue(transformation, "displayName", String.class); - - if (displayName == null) { - return null;//XXX - } - - HintMetadata hm = HintMetadata.Builder.create(id).setDescription(displayName, displayName).setCategory(CATEGORY).build(); - - return HintDescriptionFactory.create() - .setMetadata(hm) - .setTrigger(PatternDescription.create(patternString, variableTypes)) - .setWorker(new WorkerImpl(displayName, fixes)) - .produce(); - } - - private static final String CATEGORY = "Transformations"; - - private static final class FixDescription { - private final String displayName; - private final String pattern; - - public FixDescription(String displayName, String pattern) { - this.displayName = displayName; - this.pattern = pattern; - } - - public String getDisplayName() { - return displayName; - } - - public String getPattern() { - return pattern; - } - - } - - private static final File ANNOTATIONS_JAR; - private static final File NB_OVERLAY_JAR; - private static final File JDK_OVERLAY_JAR; - - static { - ANNOTATIONS_JAR = InstalledFileLocator.getDefault().locate("libs/annotations.jar", null, false); - NB_OVERLAY_JAR = InstalledFileLocator.getDefault().locate("overlay/org-netbeans-nboverlay.jar", null, false); - JDK_OVERLAY_JAR = InstalledFileLocator.getDefault().locate("overlay/jdk.jar", null, false); - } - - private ClassPath prepareOverlayCompileCP() throws IllegalArgumentException { - if (NB_OVERLAY_JAR ==null) { - return ClassPathSupport.createClassPath(new URL[0]); - } - - return ClassPathSupport.createClassPath(FileUtil.urlForArchiveOrDir(NB_OVERLAY_JAR)); - } - - private ClassPath prepareOverlayBootCP() throws IllegalArgumentException { - if (ANNOTATIONS_JAR == null) { - return ClassPathSupport.createClassPath(new URL[0]); - } - - if (JDK_OVERLAY_JAR == null) { - return ClassPathSupport.createClassPath(FileUtil.urlForArchiveOrDir(ANNOTATIONS_JAR)); - } - - return ClassPathSupport.createClassPath(FileUtil.urlForArchiveOrDir(ANNOTATIONS_JAR), FileUtil.urlForArchiveOrDir(JDK_OVERLAY_JAR)); - } - - private List processAnnotations(Element e, Element enclosing, CompilationInfo info, CompilationInfo fake) { - boolean foundTransformations = false; - List result = new LinkedList(); - String id; - switch (e.getKind()) { - case ANNOTATION_TYPE: - case CLASS: - case ENUM: - case INTERFACE: - id = fake.getElements().getBinaryName((TypeElement) e).toString(); - break; - case FIELD: - case ENUM_CONSTANT: - id = fake.getElements().getBinaryName((TypeElement) enclosing).toString() + e.getSimpleName().toString(); - break; - case CONSTRUCTOR: - case METHOD: - //XXX: parameters! - id = fake.getElements().getBinaryName((TypeElement) enclosing).toString() + e.getSimpleName().toString(); - break; - default: - id = "no-id"; - break; - } - - int index = 0; - - for (AnnotationMirror am : e.getAnnotationMirrors()) { - String fqn = ((TypeElement) am.getAnnotationType().asElement()).getQualifiedName().toString(); - List transformations = new LinkedList(); - if (TRANSFORMATION.toFQN().equals(fqn)) { - transformations.add(am); - foundTransformations = true; - } - if (TRANSFORMATION_SET.toFQN().equals(fqn)) { - for (AnnotationMirror m : Utilities.checkedIterableByFilter(findValue(am, "value", Collection.class), AnnotationMirror.class, true)) { - transformations.add(m); - } - foundTransformations = true; - } - - for (AnnotationMirror t : transformations) { - HintDescription pd = create(info, e, t, id + "-" + (index++), fake); - - if (pd != null) { - result.add(pd); - } - } - } - - if (!foundTransformations && e.getKind() == ElementKind.METHOD) { - TypeElement owner = (TypeElement) e.getEnclosingElement(); - - for (TypeMirror tm : fake.getTypes().directSupertypes(owner.asType())) { - DeclaredType dt = (DeclaredType) tm; - TypeElement parent = (TypeElement) dt.asElement(); - - for (ExecutableElement ee : ElementFilter.methodsIn(parent.getEnclosedElements())) { - if (!fake.getElements().overrides((ExecutableElement) e, ee, (TypeElement) enclosing)) { - continue; - } - List r = processAnnotations(ee, enclosing, info, fake); - - result.addAll(r); - } - - } - } - - return result; - } - - private static String defaultFixDisplayName(CompilationInfo info, Map variables, FixDescription d) { - Map stringsForVariables = new HashMap(); - - for (Entry e : variables.entrySet()) { - Tree t = e.getValue().getLeaf(); - SourcePositions sp = info.getTrees().getSourcePositions(); - int startPos = (int) sp.getStartPosition(info.getCompilationUnit(), t); - int endPos = (int) sp.getEndPosition(info.getCompilationUnit(), t); - - stringsForVariables.put(e.getKey(), info.getText().substring(startPos, endPos)); - } - - if (!stringsForVariables.containsKey("$this")) { - stringsForVariables.put("$this", "this"); - } - - String replaceTarget = d.getPattern(); - - for (Entry e : stringsForVariables.entrySet()) { - String quotedVariable = java.util.regex.Pattern.quote(e.getKey()); - String quotedTarget = Matcher.quoteReplacement(e.getValue()); - replaceTarget = replaceTarget.replaceAll(quotedVariable, quotedTarget); - } - - return "Rewrite to " + replaceTarget; - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/src/org/netbeans/modules/jackpot30/transformers/Utilities.java --- a/sandbox/old-modules/transformer/src/org/netbeans/modules/jackpot30/transformers/Utilities.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,138 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008-2009 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.jackpot30.transformers; - -import com.sun.source.tree.AnnotationTree; -import com.sun.source.tree.AssignmentTree; -import com.sun.source.tree.ExpressionTree; -import com.sun.source.tree.IdentifierTree; -import com.sun.source.tree.LiteralTree; -import com.sun.source.tree.MemberSelectTree; -import com.sun.source.tree.NewArrayTree; -import com.sun.source.tree.Tree; -import com.sun.source.tree.Tree.Kind; -import java.util.Arrays; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.TypeMirror; -import org.netbeans.api.java.source.TreeMaker; -import org.netbeans.api.java.source.WorkingCopy; -import org.openide.util.NbCollections; - -/** - * - * @author Jan Lahoda - */ -public class Utilities { - - private Utilities() {} - - public static Iterable checkedIterableByFilter(final Iterable raw, final Class type, final boolean strict) { - return new Iterable() { - public Iterator iterator() { - return NbCollections.checkedIteratorByFilter(raw.iterator(), type, strict); - } - }; - } - -// public static AnnotationTree constructConstraint(WorkingCopy wc, String name, TypeMirror tm) { -// TreeMaker make = wc.getTreeMaker(); -// ExpressionTree variable = prepareAssignment(make, "variable", make.Literal(name)); -// ExpressionTree type = prepareAssignment(make, "type", make.MemberSelect((ExpressionTree) make.Type(wc.getTypes().erasure(tm)), "class")); -// TypeElement constraint = wc.getElements().getTypeElement(Annotations.CONSTRAINT.toFQN()); -// -// return make.Annotation(make.QualIdent(constraint), Arrays.asList(variable, type)); -// } - - public static ExpressionTree prepareAssignment(TreeMaker make, String name, ExpressionTree value) { - return make.Assignment(make.Identifier(name), value); - } - - public static ExpressionTree findValue(AnnotationTree m, String name) { - for (ExpressionTree et : m.getArguments()) { - if (et.getKind() == Kind.ASSIGNMENT) { - AssignmentTree at = (AssignmentTree) et; - String varName = ((IdentifierTree) at.getVariable()).getName().toString(); - - if (varName.equals(name)) { - return at.getExpression(); - } - } - - if (et instanceof LiteralTree/*XXX*/ && "value".equals(name)) { - return et; - } - } - - return null; - } - - public static List findArrayValue(AnnotationTree at, String name) { - ExpressionTree fixesArray = findValue(at, name); - List fixes = new LinkedList(); - - if (fixesArray != null && fixesArray.getKind() == Kind.NEW_ARRAY) { - NewArrayTree trees = (NewArrayTree) fixesArray; - - for (ExpressionTree fix : trees.getInitializers()) { - if (fix.getKind() == Kind.ANNOTATION) { - fixes.add((AnnotationTree) fix); - } - } - } - - if (fixesArray != null && fixesArray.getKind() == Kind.ANNOTATION) { - fixes.add((AnnotationTree) fixesArray); - } - - return fixes; - } - - public static boolean isPureMemberSelect(Tree mst, boolean allowVariables) { - switch (mst.getKind()) { - case IDENTIFIER: return allowVariables || ((IdentifierTree) mst).getName().charAt(0) != '$'; - case MEMBER_SELECT: return isPureMemberSelect(((MemberSelectTree) mst).getExpression(), allowVariables); - default: return false; - } - } - -} diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/src/org/netbeans/modules/jackpot30/transformers/resources/Bundle.properties --- a/sandbox/old-modules/transformer/src/org/netbeans/modules/jackpot30/transformers/resources/Bundle.properties Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this -# particular file as subject to the "Classpath" exception as provided -# by Sun in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): -# -# Portions Copyrighted 2009 Sun Microsystems, Inc. - -OpenIDE-Module-Name=Jackpot 3.0 Transformations diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/src/org/netbeans/modules/jackpot30/transformers/resources/layer.xml --- a/sandbox/old-modules/transformer/src/org/netbeans/modules/jackpot30/transformers/resources/layer.xml Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - - - diff -r 205b7632914c -r 57843026e60b sandbox/old-modules/transformer/test/unit/src/org/netbeans/modules/jackpot30/transformers/TransformationHintProviderImplTest.java --- a/sandbox/old-modules/transformer/test/unit/src/org/netbeans/modules/jackpot30/transformers/TransformationHintProviderImplTest.java Mon Dec 19 11:37:36 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,555 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common - * Development and Distribution License("CDDL") (collectively, the - * "License"). You may not use this file except in compliance with the - * License. You can obtain a copy of the License at - * http://www.netbeans.org/cddl-gplv2.html - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - * specific language governing permissions and limitations under the - * License. When distributing the software, include this License Header - * Notice in each file and include the License file at - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the - * License Header, with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * If you wish your version of this file to be governed by only the CDDL - * or only the GPL Version 2, indicate your decision by adding - * "[Contributor] elects to include this software in this distribution - * under the [CDDL or GPL Version 2] license." If you do not indicate a - * single choice of license, a recipient has the option to distribute - * your version of this file under either the CDDL, the GPL Version 2 or - * to extend the choice of license to its licensees as provided above. - * However, if you add GPL Version 2 code and therefore, elected the GPL - * Version 2 license, then the option applies only if the new code is - * made subject to such option by the copyright holder. - * - * Contributor(s): - * - * Portions Copyrighted 2008 Sun Microsystems, Inc. - */ - -package org.netbeans.modules.jackpot30.transformers; - -import com.sun.source.tree.Tree.Kind; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.swing.text.Document; -import org.netbeans.api.java.lexer.JavaTokenId; -import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.JavaSource.Phase; -import org.netbeans.api.java.source.SourceUtilsTestUtil; -import org.netbeans.api.java.source.TestUtilities; -import org.netbeans.api.lexer.Language; -import org.netbeans.junit.NbTestCase; -import org.netbeans.modules.java.hints.jackpot.impl.RulesManager; -import org.netbeans.modules.java.hints.jackpot.impl.hints.HintsInvoker; -import org.netbeans.modules.java.hints.jackpot.spi.ClassPathBasedHintProvider; -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription; -import org.netbeans.modules.java.hints.jackpot.spi.Trigger.PatternDescription; -import org.netbeans.modules.java.source.TreeLoader; -import org.netbeans.spi.editor.hints.ErrorDescription; -import org.netbeans.spi.editor.hints.Fix; -import org.openide.LifecycleManager; -import org.openide.cookies.EditorCookie; -import org.openide.filesystems.FileObject; -import org.openide.filesystems.FileUtil; -import org.openide.loaders.DataObject; -import org.openide.modules.InstalledFileLocator; - -/** - * - * @author Jan Lahoda - */ -public class TransformationHintProviderImplTest extends NbTestCase { - - public TransformationHintProviderImplTest(String name) { - super(name); - } - - public void testSimpleAnalysis() throws Exception { - performAnalysisTest("package test;\n" + - "import net.java.lang.annotations.Constraint;\n" + - "import net.java.lang.annotations.Fix;\n" + - "import net.java.lang.annotations.Pattern;\n" + - "import net.java.lang.annotations.Transformation;\n" + - "public class Test {\n" + - " @Transformation(\n" + - " displayName=\"O\",\n" + - " pattern=@Pattern(\"$0.getCookie($1)\"),\n" + - " constraint={\n" + - " @Constraint(variable=\"$0\", type=Test.class),\n" + - " @Constraint(variable=\"$1\", type=Class.class)\n" + - " },\n" + - " fix=@Fix(\"$0.lookup($1)\")\n" + - " )\n" + - " public void getCookie(Class c) {}\n" + - " private void test() {\n" + - " getCookie(null);\n" + - " }\n" + - "}\n", - "17:9-17:18:verifier:O"); - } - - public void testCanGoUp() throws Exception { - performAnalysisTest("package test;\n" + - "import net.java.lang.annotations.Constraint;\n" + - "import net.java.lang.annotations.Fix;\n" + - "import net.java.lang.annotations.Pattern;\n" + - "import net.java.lang.annotations.Transformation;\n" + - "public abstract class Test {\n" + - " @Transformation(\n" + - " displayName=\"O\",\n" + - " pattern=@Pattern(\"$0.getCookie().toString()\"),\n" + - " constraint={\n" + - " @Constraint(variable=\"$0\", type=Test.class)\n" + - " },\n" + - " fix=@Fix(\"$0.lookup($1)\")\n" + - " )\n" + - " public abstract String getCookie();\n" + - " private void test() {\n" + - " getCookie().toString();\n" + - " }\n" + - "}\n", - "16:21-16:29:verifier:O"); - } - - public void testForConstructor() throws Exception { - performAnalysisTest("package test;\n" + - "import net.java.lang.annotations.Constraint;\n" + - "import net.java.lang.annotations.Fix;\n" + - "import net.java.lang.annotations.Pattern;\n" + - "import net.java.lang.annotations.Transformation;\n" + - "public class Test {\n" + - " @Transformation(\n" + - " displayName=\"O\",\n" + - " pattern=@Pattern(\"new test.Test()\"),\n" + - " fix={}\n" + - " )\n" + - " public Test() {}\n" + - " private void test() {\n" + - " new Test();\n" + - " }\n" + - "}\n", - "13:9-13:19:verifier:O"); - } - - public void testMoreWarnings() throws Exception { - performAnalysisTest("package test;\n" + - "import net.java.lang.annotations.Constraint;\n" + - "import net.java.lang.annotations.Fix;\n" + - "import net.java.lang.annotations.Pattern;\n" + - "import net.java.lang.annotations.Transformation;\n" + - "public class Test {\n" + - " @Transformation(\n" + - " displayName=\"O\",\n" + - " pattern=@Pattern(\"new test.Test()\"),\n" + - " fix={}\n" + - " )\n" + - " public Test() {}\n" + - " private void test() {\n" + - " new Test();\n" + - " new Test();\n" + - " }\n" + - "}\n", - "13:9-13:19:verifier:O", - "14:9-14:19:verifier:O"); - } - - public void testCorrectImports() throws Exception { - performFixTest("test/Test.java", - "package test;\n" + - "import net.java.lang.annotations.Constraint;\n" + - "import net.java.lang.annotations.Fix;\n" + - "import net.java.lang.annotations.Pattern;\n" + - "import net.java.lang.annotations.Transformation;\n" + - "public abstract class Test {\n" + - " @Transformation(\n" + - " displayName=\"O\",\n" + - " pattern=@Pattern(\"$this.test()\"),\n" + - " fix=@Fix(\"test.Test.test1().toString()\")\n" + - " )\n" + - " private void test() {\n" + - " test();\n" + - " }" + - " static String test1() {return null;}\n" + - "}\n", - "12:9-12:13:verifier:O", - "FixImpl", - "package test;\n" + - "import net.java.lang.annotations.Constraint;\n" + - "import net.java.lang.annotations.Fix;\n" + - "import net.java.lang.annotations.Pattern;\n" + - "import net.java.lang.annotations.Transformation;\n" + - "public abstract class Test {\n" + - " @Transformation(\n" + - " displayName=\"O\",\n" + - " pattern=@Pattern(\"$this.test()\"),\n" + - " fix=@Fix(\"test.Test.test1().toString()\")\n" + - " )\n" + - " private void test() {\n" + - " Test.test1().toString();\n" + - " }" + - " static String test1() {return null;}\n" + - "}\n"); - } - - public void testNoExceptions1() throws Exception { - performNoExceptionsTest("package test;\n" + - "import net.java.lang.annotations.Constraint;\n" + - "import net.java.lang.annotations.Fix;\n" + - "import net.java.lang.annotations.Pattern;\n" + - "import net.java.lang.annotations.Transformation;\n" + - "public abstract class Test {\n" + - " |public abstract String getCookie();\n" + - " private void test() {\n" + - " getCookie().toString();\n" + - " }\n" + - "}\n", - " @Transformation(\n" + - " displayName=\"O\",\n" + - " pattern=@Pattern(\"$0.getCookie().toString()\"),\n" + - " constraint={\n" + - " @Constraint(variable=\"$0\", type=Test.class)\n" + - " },\n" + - " fix={@Fix(\"$0.lookup($1)\")}\n" + - " )\n".replaceAll("[ \n]+", " ")); - } - - public void testNoExceptions2() throws Exception { - performNoExceptionsTest("package test;\n" + - "import net.java.lang.annotations.Constraint;\n" + - "import net.java.lang.annotations.Fix;\n" + - "import net.java.lang.annotations.Pattern;\n" + - "import net.java.lang.annotations.Transformation;\n" + - "public abstract class Test {\n" + - " |public abstract String getCookie();\n" + - " private void test() {\n" + - " getCookie().toString();\n" + - " }\n" + - "}\n", - " @Transformation(\n" + - " displayName=\"O\",\n" + - " pattern=@Pattern(\"$0.getCookie().toString()\"),\n" + - " constraint=\n" + - " @Constraint(variable=\"$0\", type=Test.class)\n" + - " ,\n" + - " fix=@Fix(\"$0.lookup($1)\")\n" + - " )\n".replaceAll("[ \n]+", " ")); - } - - public void testType1() throws Exception { - performFixTest("test/Test.java", - "package test;\n" + - "import net.java.lang.annotations.Constraint;\n" + - "import net.java.lang.annotations.Fix;\n" + - "import net.java.lang.annotations.Pattern;\n" + - "import net.java.lang.annotations.Transformation;\n" + - "public abstract class Test {\n" + - " @Transformation(\n" + - " displayName=\"O\",\n" + - " pattern=@Pattern(\"test.Test.Bad\"),\n" + - " fix=@Fix(\"test.Test.Good\")\n" + - " )\n" + - " public static class Bad {}\n" + - " public static class Good {}\n" + - " static void test1() { Bad b; }\n" + - "}\n", - "13:26-13:29:verifier:O", - "FixImpl", - "package test;\n" + - "import net.java.lang.annotations.Constraint;\n" + - "import net.java.lang.annotations.Fix;\n" + - "import net.java.lang.annotations.Pattern;\n" + - "import net.java.lang.annotations.Transformation;\n" + - "public abstract class Test {\n" + - " @Transformation(\n" + - " displayName=\"O\",\n" + - " pattern=@Pattern(\"test.Test.Bad\"),\n" + - " fix=@Fix(\"test.Test.Good\")\n" + - " )\n" + - " public static class Bad {}\n" + - " public static class Good {}\n" + - " static void test1() { Good b; }\n" + - "}\n".replaceAll("[ \n]+", " ")); - } - - public void testCorrectReplace() throws Exception { - performFixTest("test/Test.java", - "package test;\n" + - "import net.java.lang.annotations.Constraint;\n" + - "import net.java.lang.annotations.Fix;\n" + - "import net.java.lang.annotations.Pattern;\n" + - "import net.java.lang.annotations.Transformation;\n" + - "public class Test {\n" + - " @Transformation(\n" + - " displayName=\"O\",\n" + - " pattern=@Pattern(\"$this.test()\"),\n" + - " fix=@Fix(\"$this.test()\")\n" + - " )\n" + - " private void test() {\n" + - " new Test().test();\n" + - " }\n" + - "}\n", - "12:20-12:24:verifier:O", - "FixImpl", - "package test;\n" + - "import net.java.lang.annotations.Constraint;\n" + - "import net.java.lang.annotations.Fix;\n" + - "import net.java.lang.annotations.Pattern;\n" + - "import net.java.lang.annotations.Transformation;\n" + - "public class Test {\n" + - " @Transformation(\n" + - " displayName=\"O\",\n" + - " pattern=@Pattern(\"$this.test()\"),\n" + - " fix=@Fix(\"$this.test()\")\n" + - " )\n" + - " private void test() {\n" + - " new Test().test();\n" + - " }\n" + - "}\n"); - } - - @Override - protected void setUp() throws Exception { - super.setUp(); - - File jar = FileUtil.archiveOrDirForURL(TransformationHintProviderImpl.class.getProtectionDomain().getCodeSource().getLocation()); - - assertNotNull(jar); - - String nbHome = jar.getParentFile().getParentFile().getAbsolutePath(); - - System.setProperty("netbeans.home",nbHome); - - SourceUtilsTestUtil.prepareTest(new String[] {"org/netbeans/modules/java/editor/resources/layer.xml"}, new Object[0]); - TreeLoader.DISABLE_CONFINEMENT_TEST = true; - } - - private List computeWarnings() { - List hints = new ArrayList(); - - RulesManager.computeElementBasedHintsXXX(info, new AtomicBoolean(), Collections.singletonList(new TransformationHintProviderImpl()), Collections.emptyList(), hints); - - List warnings = new HintsInvoker(info, new AtomicBoolean()).computeHints(info, hints); - - return warnings; - } - - private void prepareTest(String fileName, String code) throws Exception { - prepareTest(fileName, code, false); - } - - private void prepareTest(String fileName, String code, boolean ignoreErrors) throws Exception { - clearWorkDir(); - - FileUtil.refreshFor(File.listRoots()); - - FileObject workFO = FileUtil.toFileObject(getWorkDir()); - - assertNotNull(workFO); - - workFO.refresh(); - - sourceRoot = workFO.createFolder("src"); - FileObject buildRoot = workFO.createFolder("build"); - FileObject cache = workFO.createFolder("cache"); - - FileObject data = FileUtil.createData(sourceRoot, fileName); - File dataFile = FileUtil.toFile(data); - - assertNotNull(dataFile); - - TestUtilities.copyStringToFile(dataFile, code); - - File ann = InstalledFileLocator.getDefault().locate("libs/annotations.jar", null, false); - - if (ann == null) { - ann = InstalledFileLocator.getDefault().locate("release/libs/annotations.jar", null, false); - } - - assertNotNull(System.getProperty("netbeans.home"), ann); - - FileObject annFO = FileUtil.toFileObject(ann); - - assertNotNull(annFO); - - SourceUtilsTestUtil.prepareTest(sourceRoot, buildRoot, cache, new FileObject[] {FileUtil.getArchiveRoot(annFO)}); - - DataObject od = DataObject.find(data); - EditorCookie ec = od.getLookup().lookup(EditorCookie.class); - - assertNotNull(ec); - - doc = ec.openDocument(); - doc.putProperty(Language.class, JavaTokenId.language()); - - JavaSource js = JavaSource.forFileObject(data); - - assertNotNull(js); - - info = SourceUtilsTestUtil.getCompilationInfo(js, Phase.RESOLVED); - - assertNotNull(info); - - if (!ignoreErrors) { - assertEquals(info.getDiagnostics().toString(), 0, info.getDiagnostics().size()); - } - } - - private FileObject sourceRoot; - private CompilationInfo info; - private Document doc; - private String wordDirPath; - - protected void performNoExceptionsTest(String code, String type) throws Exception { - String wDP = getWorkDirPath(); - - int offset = code.indexOf('|'); - - code = code.replace("|", ""); - - File prev = null; - - for (int i = 0; i < type.length(); i++) { - StringBuilder nueCode = new StringBuilder(); - - nueCode.append(code); - nueCode.insert(offset, type.substring(0, i + 1)); - - this.wordDirPath = wDP + File.separatorChar + i; - - performAnalysisTest(nueCode.toString(), null, true); - - if (prev != null) { - deleteFile(prev); - FileUtil.refreshFor(File.listRoots()); - } - - prev = getWorkDir(); - } - } - - protected void performAnalysisTest(String code, String... golden) throws Exception { - performAnalysisTest(code, golden, false); - } - - protected void performAnalysisTest(String code, String[] golden, boolean ignoreErrors) throws Exception { - prepareTest("test/Test.java", code, ignoreErrors); - - List warnings = computeWarnings(); - List dns = new LinkedList(); - - for (ErrorDescription ed : warnings) { - dns.add(ed.toString()); - } - - if (golden != null) { - assertEquals(Arrays.asList(golden), dns); - } - } - - protected String performFixTest(String fileName, String code, String errorDescriptionToString, String fixDebugString, String golden) throws Exception { - prepareTest(fileName, code); - - List errors = computeWarnings(); - - ErrorDescription toFix = null; - - for (ErrorDescription d : errors) { - if (errorDescriptionToString.equals(d.toString())) { - toFix = d; - break; - } - } - - assertNotNull("Error: \"" + errorDescriptionToString + "\" not found. All ErrorDescriptions: " + errors.toString(), toFix); - - assertTrue("Must be computed", toFix.getFixes().isComputed()); - - List fixes = toFix.getFixes().getFixes(); - List fixNames = new LinkedList(); - Fix toApply = null; - - for (Fix f : fixes) { - if (fixDebugString.equals(toDebugString(info, f))) { - toApply = f; - } - - fixNames.add(toDebugString(info, f)); - } - - assertNotNull("Cannot find fix to invoke: " + fixNames.toString(), toApply); - - toApply.implement(); - - FileObject toCheck = sourceRoot.getFileObject(fileName); - - assertNotNull(toCheck); - - DataObject toCheckDO = DataObject.find(toCheck); - EditorCookie ec = toCheckDO.getCookie(EditorCookie.class); - Document toCheckDocument = ec.openDocument(); - - String realCode = toCheckDocument.getText(0, toCheckDocument.getLength()); - - //ignore whitespaces: - realCode = realCode.replaceAll("[ \t\n]+", " "); - - if (golden != null) { - golden = golden.replaceAll("[ \t\n]+", " "); - assertEquals("The output code does not match the expected code.", golden, realCode); - } - - LifecycleManager.getDefault().saveAll(); - - return realCode; - } - - private String toDebugString(CompilationInfo info, Fix f) { - return "FixImpl"; - } - - @Override - public String getWorkDirPath() { - if (this.wordDirPath != null) { - return this.wordDirPath; - } - - return super.getWorkDirPath(); - } - - private static void deleteFile(File file) throws IOException { - if (file.isDirectory()) { - // file is a directory - delete sub files first - File files[] = file.listFiles(); - for (int i = 0; i < files.length; i++) { - deleteFile(files[i]); - } - - } - // file is a File :-) - boolean result = file.delete(); - if (result == false ) { - // a problem has appeared - throw new IOException("Cannot delete file, file = "+file.getPath()); - } - } -}