Repository: incubator-netbeans Updated Branches: refs/heads/jdk-javac [created] ffc0de5a1
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ffc0de5a/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/BulkSearchTestPerformer.java ---------------------------------------------------------------------- diff --git a/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/BulkSearchTestPerformer.java b/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/BulkSearchTestPerformer.java index 92cd8a2..ef76535 100644 --- a/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/BulkSearchTestPerformer.java +++ b/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/pm/BulkSearchTestPerformer.java @@ -51,7 +51,7 @@ 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.netbeans.modules.java.source.TreeLoader; import org.openide.cookies.EditorCookie; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; @@ -73,7 +73,8 @@ public abstract class BulkSearchTestPerformer extends NbTestCase { 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; + //XXX: +// TreeLoader.DISABLE_CONFINEMENT_TEST = true; } // public static TestSuite suite() { http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ffc0de5a/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/matching/CopyFinderTest.java ---------------------------------------------------------------------- diff --git a/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/matching/CopyFinderTest.java b/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/matching/CopyFinderTest.java index 2719b1e..2d22c39 100644 --- a/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/matching/CopyFinderTest.java +++ b/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/matching/CopyFinderTest.java @@ -24,7 +24,7 @@ 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 org.netbeans.api.java.source.support.ErrorAwareTreePathScanner; import java.io.File; import java.util.Arrays; import java.util.Collection; @@ -1565,7 +1565,7 @@ public class CopyFinderTest extends NbTestCase { for (final String name : remappableVariables.split(",")) { if (name.isEmpty()) continue; - new TreePathScanner<Object, Object>() { + new ErrorAwareTreePathScanner<Object, Object>() { @Override public Object visitVariable(VariableTree node, Object p) { if (node.getName().contentEquals(name)) { http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ffc0de5a/testng.ui/nbproject/project.properties ---------------------------------------------------------------------- diff --git a/testng.ui/nbproject/project.properties b/testng.ui/nbproject/project.properties index 7f641b7..375b088 100644 --- a/testng.ui/nbproject/project.properties +++ b/testng.ui/nbproject/project.properties @@ -17,3 +17,4 @@ is.eager=true javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial +requires.nb.javac=true http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ffc0de5a/websvc.saas.codegen.java/nbproject/project.properties ---------------------------------------------------------------------- diff --git a/websvc.saas.codegen.java/nbproject/project.properties b/websvc.saas.codegen.java/nbproject/project.properties index 6de45e1..7fb2198 100644 --- a/websvc.saas.codegen.java/nbproject/project.properties +++ b/websvc.saas.codegen.java/nbproject/project.properties @@ -17,3 +17,4 @@ is.autoload=true javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial +requires.nb.javac=true http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ffc0de5a/whitelist/src/org/netbeans/api/whitelist/support/WhiteListSupport.java ---------------------------------------------------------------------- diff --git a/whitelist/src/org/netbeans/api/whitelist/support/WhiteListSupport.java b/whitelist/src/org/netbeans/api/whitelist/support/WhiteListSupport.java index 660239d..ae254f4 100644 --- a/whitelist/src/org/netbeans/api/whitelist/support/WhiteListSupport.java +++ b/whitelist/src/org/netbeans/api/whitelist/support/WhiteListSupport.java @@ -26,7 +26,7 @@ import com.sun.source.tree.MethodInvocationTree; import com.sun.source.tree.MethodTree; import com.sun.source.tree.NewClassTree; import com.sun.source.tree.Tree; -import com.sun.source.util.TreePathScanner; +import org.netbeans.api.java.source.support.ErrorAwareTreePathScanner; import com.sun.source.util.Trees; import java.util.ArrayDeque; import java.util.HashMap; @@ -92,7 +92,7 @@ public final class WhiteListSupport { } //<editor-fold defaultstate="collapsed" desc="Private implementation"> - private static class WhiteListScanner extends TreePathScanner<Void, Map<Tree,WhiteListQuery.Result>> { + private static class WhiteListScanner extends ErrorAwareTreePathScanner<Void, Map<Tree,WhiteListQuery.Result>> { private final Trees trees; private final Callable<Boolean> cancel; http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ffc0de5a/xml.jaxb/nbproject/project.properties ---------------------------------------------------------------------- diff --git a/xml.jaxb/nbproject/project.properties b/xml.jaxb/nbproject/project.properties index 1dcd75d..8f48df1 100644 --- a/xml.jaxb/nbproject/project.properties +++ b/xml.jaxb/nbproject/project.properties @@ -28,3 +28,4 @@ disable.qa-functional.tests=true test.config.stableBTD.includes=**/*Test.class test.config.stableBTD.excludes=org/netbeans/test/**/* +requires.nb.javac=true http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ffc0de5a/xml.tools.java/nbproject/project.properties ---------------------------------------------------------------------- diff --git a/xml.tools.java/nbproject/project.properties b/xml.tools.java/nbproject/project.properties index a25463a..450b8b0 100644 --- a/xml.tools.java/nbproject/project.properties +++ b/xml.tools.java/nbproject/project.properties @@ -17,3 +17,4 @@ javac.compilerargs=-Xlint -Xlint:-serial disable.qa-functional.tests=true javac.source=1.5 +requires.nb.javac=true