You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jl...@apache.org on 2017/12/19 09:22:58 UTC
[incubator-netbeans] branch jdk-javac updated: Various cleanup.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch jdk-javac
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/jdk-javac by this push:
new a190287 Various cleanup.
a190287 is described below
commit a19028746c929df2284f12cbd8c8c2bd0d9ddb74
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Tue Dec 19 10:21:04 2017 +0100
Various cleanup.
---
beans/nbproject/project.properties | 2 +-
form.binding/nbproject/project.properties | 1 -
form.j2ee/nbproject/project.properties | 1 -
form.nb/nbproject/project.properties | 1 -
form.refactoring/nbproject/project.properties | 1 -
hibernate/nbproject/project.properties | 1 -
i18n/nbproject/project.properties | 1 -
j2ee.core.utilities/nbproject/project.properties | 1 -
.../java/completion/CompletionTestBase.java | 1 -
.../editor/base/semantic/UnusedImportsTest.java | 4 +-
.../codegen/DelegateMethodGeneratorTest.java | 4 +-
.../java/editor/completion/CompletionTestBase.java | 1 -
.../IsOverriddenAnnotationCreatorTest.java | 3 +-
.../debugging/EvaluationSpanTaskTest.java | 5 +-
.../java/hints/bugs/AssertWithSideEffects.java | 14 -----
.../java/hints/errors/MissingReturnStatement.java | 3 -
.../hints/suggestions/ExpectedTypeResolver.java | 2 +-
.../hints/infrastructure/TreeRuleTestBase.java | 5 +-
.../java/hints/introduce/RefFinderTest.java | 4 --
java.j2seprofiles/nbproject/project.properties | 1 -
.../java/metrics/hints/MethodMetricsTest.java | 2 +-
java.module.graph/nbproject/project.xml | 13 +----
.../org/netbeans/api/java/source/SourceUtils.java | 1 -
.../netbeans/api/java/source/TreeUtilities.java | 26 +++++++--
.../netbeans/api/java/source/TypeUtilities.java | 3 -
.../modules/java/source/JavaSourceUtilImpl.java | 4 --
.../modules/java/source/TreeUtilitiesAccessor.java | 67 ++++++++++++++++++++++
.../modules/java/source/parsing/FileObjects.java | 1 +
.../modules/java/source/save/Reindenter.java | 30 +++++-----
.../source/indexing/VanillaCompileWorkerTest.java | 9 +--
.../nbjavac/indexing/MultiPassCompileWorker.java | 14 ++---
.../nbjavac/indexing/OnePassCompileWorker.java | 5 +-
.../indexing/SuperOnePassCompileWorker.java | 4 +-
.../nbjavac/parsing/PartialReparserImpl.java | 14 ++---
.../lib/nbjavac/services/CouplingTest.java | 2 +-
.../api/java/source/ui/ElementHeadersTest.java | 4 +-
java.testrunner.ui/nbproject/project.properties | 1 -
.../javafx2/editor/FXMLCompletionTestBase.java | 1 -
jshell.support/nbproject/project.xml | 9 ---
junit.ui/nbproject/project.properties | 1 -
.../nbjavac/services/AnonymousNumberingTest.java | 10 ----
.../lib/nbjavac/services/NBClassWriterTest.java | 3 -
.../netbeans/lib/nbjavac/services/Utilities.java | 9 +--
libs.javacapi/build.xml | 2 -
libs.javacapi/manifest.mf | 1 -
libs.javacimpl/build.xml | 2 -
libs.javacimpl/manifest.mf | 2 -
libs.javacimpl/nbproject/project.properties | 1 -
libs.jshell.compile/nbproject/project.xml | 17 ------
.../java/hints/spiimpl/pm/NFABasedBulkSearch.java | 1 -
.../modules/java/hints/spiimpl/TestBase.java | 5 +-
.../hints/spiimpl/pm/BulkSearchTestPerformer.java | 5 +-
52 files changed, 147 insertions(+), 178 deletions(-)
diff --git a/beans/nbproject/project.properties b/beans/nbproject/project.properties
index ac47b14..8930675 100644
--- a/beans/nbproject/project.properties
+++ b/beans/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
spec.version.base=1.52.0
-cp.extra=${tools.jar}
+
test.config.stable.includes=\
**/PropertyGeneration.class
diff --git a/form.binding/nbproject/project.properties b/form.binding/nbproject/project.properties
index 212ca62..9924871 100644
--- a/form.binding/nbproject/project.properties
+++ b/form.binding/nbproject/project.properties
@@ -18,5 +18,4 @@
is.eager=true
javac.source=1.6
spec.version.base=0.18.0
-cp.extra=${tools.jar}
requires.nb.javac=true
diff --git a/form.j2ee/nbproject/project.properties b/form.j2ee/nbproject/project.properties
index a7a5f0d..6b1d98d 100644
--- a/form.j2ee/nbproject/project.properties
+++ b/form.j2ee/nbproject/project.properties
@@ -18,5 +18,4 @@
is.eager=true
javac.source=1.6
spec.version.base=0.34.0
-cp.extra=${tools.jar}
requires.nb.javac=true
diff --git a/form.nb/nbproject/project.properties b/form.nb/nbproject/project.properties
index 3ee4af6..5c87557 100644
--- a/form.nb/nbproject/project.properties
+++ b/form.nb/nbproject/project.properties
@@ -18,5 +18,4 @@
is.eager=true
javac.source=1.6
spec.version.base=0.19.0
-cp.extra=${tools.jar}
requires.nb.javac=true
diff --git a/form.refactoring/nbproject/project.properties b/form.refactoring/nbproject/project.properties
index 212ca62..9924871 100644
--- a/form.refactoring/nbproject/project.properties
+++ b/form.refactoring/nbproject/project.properties
@@ -18,5 +18,4 @@
is.eager=true
javac.source=1.6
spec.version.base=0.18.0
-cp.extra=${tools.jar}
requires.nb.javac=true
diff --git a/hibernate/nbproject/project.properties b/hibernate/nbproject/project.properties
index 7df6ca7..83b9fdc 100644
--- a/hibernate/nbproject/project.properties
+++ b/hibernate/nbproject/project.properties
@@ -38,5 +38,4 @@ test.config.stableBTD.excludes=\
**/HibernateMappingCompletionManagerTest.class,\
**/HibernateMappingHyperlinkProviderTest.class
-cp.extra=${tools.jar}
requires.nb.javac=true
diff --git a/i18n/nbproject/project.properties b/i18n/nbproject/project.properties
index 740881b..73e1ef5 100644
--- a/i18n/nbproject/project.properties
+++ b/i18n/nbproject/project.properties
@@ -20,5 +20,4 @@ javadoc.arch=${basedir}/arch.xml
disable.qa-functional.tests=true
test.config.stableBTD.includes=**/*Test.class
-cp.extra=${tools.jar}
requires.nb.javac=true
diff --git a/j2ee.core.utilities/nbproject/project.properties b/j2ee.core.utilities/nbproject/project.properties
index 80f3dbc..95da0b4 100644
--- a/j2ee.core.utilities/nbproject/project.properties
+++ b/j2ee.core.utilities/nbproject/project.properties
@@ -24,5 +24,4 @@ test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
**/SourceGroupsTest.class
-cp.extra=${tools.jar}
requires.nb.javac=true
diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java
index 93d2a9b..7e77cfe 100644
--- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java
+++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java
@@ -56,7 +56,6 @@ import org.netbeans.core.startup.Main;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.JavaDataLoader;
import org.netbeans.modules.java.source.TestUtil;
-//import org.netbeans.modules.java.source.TreeLoader;
import org.netbeans.modules.java.source.indexing.TransactionContext;
import org.netbeans.modules.java.source.usages.BinaryAnalyser;
import org.netbeans.modules.java.source.usages.ClassIndexImpl;
diff --git a/java.editor.base/test/unit/src/org/netbeans/modules/java/editor/base/semantic/UnusedImportsTest.java b/java.editor.base/test/unit/src/org/netbeans/modules/java/editor/base/semantic/UnusedImportsTest.java
index 0a2c277..069767e 100644
--- a/java.editor.base/test/unit/src/org/netbeans/modules/java/editor/base/semantic/UnusedImportsTest.java
+++ b/java.editor.base/test/unit/src/org/netbeans/modules/java/editor/base/semantic/UnusedImportsTest.java
@@ -34,13 +34,13 @@ import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.JavaSource.Phase;
import org.netbeans.api.java.source.SourceUtils;
import org.netbeans.api.java.source.SourceUtilsTestUtil;
+import org.netbeans.api.java.source.SourceUtilsTestUtil2;
import org.netbeans.api.java.source.TestUtilities;
import org.netbeans.api.java.source.TreePathHandle;
import org.netbeans.api.lexer.Language;
import org.netbeans.core.startup.Main;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.editor.base.imports.UnusedImports;
-//import org.netbeans.modules.java.source.TreeLoader;
import org.netbeans.modules.parsing.impl.indexing.CacheFolder;
import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
@@ -335,7 +335,7 @@ public class UnusedImportsTest extends NbTestCase {
private void performUnusedImportsTest(String... golden) throws Exception {
CompilationInfo ci = SourceUtilsTestUtil.getCompilationInfo(JavaSource.forFileObject(src.getFileObject("test/Main.java")), Phase.RESOLVED);
-// TreeLoader.DISABLE_CONFINEMENT_TEST = true;
+ SourceUtilsTestUtil2.disableConfinementTest();
Document doc = ci.getSnapshot().getSource().getDocument(true);
doc.putProperty(Language.class, JavaTokenId.language());
List<TreePathHandle> unused = UnusedImports.computeUnusedImports(ci);
diff --git a/java.editor/test/unit/src/org/netbeans/modules/java/editor/codegen/DelegateMethodGeneratorTest.java b/java.editor/test/unit/src/org/netbeans/modules/java/editor/codegen/DelegateMethodGeneratorTest.java
index 9606692..a3be160 100644
--- a/java.editor/test/unit/src/org/netbeans/modules/java/editor/codegen/DelegateMethodGeneratorTest.java
+++ b/java.editor/test/unit/src/org/netbeans/modules/java/editor/codegen/DelegateMethodGeneratorTest.java
@@ -48,12 +48,12 @@ import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.JavaSource.Phase;
import org.netbeans.api.java.source.ScanUtils;
import org.netbeans.api.java.source.SourceUtilsTestUtil;
+import org.netbeans.api.java.source.SourceUtilsTestUtil2;
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.TreePathHandle;
import org.netbeans.api.java.source.WorkingCopy;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.editor.codegen.ui.ElementNode;
-//import org.netbeans.modules.java.source.TreeLoader;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
@@ -68,7 +68,7 @@ public class DelegateMethodGeneratorTest extends NbTestCase {
}
protected void setUp() throws Exception {
-// TreeLoader.DISABLE_CONFINEMENT_TEST = true;
+ SourceUtilsTestUtil2.disableConfinementTest();
}
public void testFindUsableFields() throws Exception {
diff --git a/java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/CompletionTestBase.java b/java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/CompletionTestBase.java
index 13205aa..6ba9731 100644
--- a/java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/CompletionTestBase.java
+++ b/java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/CompletionTestBase.java
@@ -61,7 +61,6 @@ import org.netbeans.modules.editor.completion.CompletionItemComparator;
import org.netbeans.modules.editor.java.JavaCompletionProvider;
import org.netbeans.modules.editor.java.JavaKit;
import org.netbeans.modules.java.JavaDataLoader;
-//import org.netbeans.modules.java.source.TreeLoader;
import org.netbeans.modules.java.source.indexing.TransactionContext;
import org.netbeans.modules.java.source.parsing.JavacParserFactory;
import org.netbeans.modules.java.source.usages.BinaryAnalyser;
diff --git a/java.editor/test/unit/src/org/netbeans/modules/java/editor/overridden/IsOverriddenAnnotationCreatorTest.java b/java.editor/test/unit/src/org/netbeans/modules/java/editor/overridden/IsOverriddenAnnotationCreatorTest.java
index df98b14..4b83a20 100644
--- a/java.editor/test/unit/src/org/netbeans/modules/java/editor/overridden/IsOverriddenAnnotationCreatorTest.java
+++ b/java.editor/test/unit/src/org/netbeans/modules/java/editor/overridden/IsOverriddenAnnotationCreatorTest.java
@@ -35,7 +35,6 @@ import org.netbeans.api.java.source.SourceUtilsTestUtil;
import org.netbeans.api.java.source.SourceUtilsTestUtil2;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.source.TestUtil;
-//import org.netbeans.modules.java.source.TreeLoader;
import org.openide.cookies.EditorCookie;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
@@ -121,8 +120,8 @@ public class IsOverriddenAnnotationCreatorTest extends NbTestCase {
ComputeOverriders.dependenciesOverride = Collections.singletonMap(sourceRoot.getURL(), Collections.<URL>emptyList());
ComputeOverriders.reverseSourceRootsInOrderOverride = Arrays.asList(sourceRoot.getURL());
-// TreeLoader.DISABLE_CONFINEMENT_TEST = true;
SourceUtilsTestUtil2.disableArtificalParameterNames();
+ SourceUtilsTestUtil2.disableConfinementTest();
}
//does not work as recursive lookup does not work:
diff --git a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTaskTest.java b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTaskTest.java
index bc84a48..aa3fe7d 100644
--- a/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTaskTest.java
+++ b/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/debugging/EvaluationSpanTaskTest.java
@@ -34,10 +34,10 @@ 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.SourceUtilsTestUtil2;
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;
@@ -57,8 +57,7 @@ public class EvaluationSpanTaskTest extends NbTestCase {
protected void setUp() throws Exception {
super.setUp();
SourceUtilsTestUtil.prepareTest(new String[] {"org/netbeans/modules/java/editor/resources/layer.xml"}, new Object[0]);
- //XXX:
-// TreeLoader.DISABLE_CONFINEMENT_TEST = true;
+ SourceUtilsTestUtil2.disableConfinementTest();
}
public void testHintConditions() throws Exception {
diff --git a/java.hints/src/org/netbeans/modules/java/hints/bugs/AssertWithSideEffects.java b/java.hints/src/org/netbeans/modules/java/hints/bugs/AssertWithSideEffects.java
index b7ca5e5..701ce0c 100644
--- a/java.hints/src/org/netbeans/modules/java/hints/bugs/AssertWithSideEffects.java
+++ b/java.hints/src/org/netbeans/modules/java/hints/bugs/AssertWithSideEffects.java
@@ -20,22 +20,8 @@ package org.netbeans.modules.java.hints.bugs;
import org.netbeans.modules.java.hints.SideEffectVisitor;
import com.sun.source.tree.AssertTree;
-import com.sun.source.tree.AssignmentTree;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompoundAssignmentTree;
-import com.sun.source.tree.LambdaExpressionTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.NewClassTree;
import com.sun.source.tree.Tree;
-import com.sun.source.tree.UnaryTree;
import com.sun.source.util.TreePath;
-import org.netbeans.api.java.source.support.ErrorAwareTreePathScanner;
-import java.util.Deque;
-import java.util.LinkedList;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.TypeElement;
import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.modules.java.hints.StopProcessing;
import org.netbeans.spi.editor.hints.ErrorDescription;
diff --git a/java.hints/src/org/netbeans/modules/java/hints/errors/MissingReturnStatement.java b/java.hints/src/org/netbeans/modules/java/hints/errors/MissingReturnStatement.java
index 37e9072..401c948 100644
--- a/java.hints/src/org/netbeans/modules/java/hints/errors/MissingReturnStatement.java
+++ b/java.hints/src/org/netbeans/modules/java/hints/errors/MissingReturnStatement.java
@@ -23,12 +23,9 @@ import com.sun.source.tree.ExpressionTree;
import com.sun.source.tree.LambdaExpressionTree;
import com.sun.source.tree.LiteralTree;
import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.ReturnTree;
import com.sun.source.tree.StatementTree;
import com.sun.source.tree.Tree.Kind;
import com.sun.source.util.TreePath;
-import org.netbeans.api.java.source.support.ErrorAwareTreeScanner;
-import com.sun.tools.javac.tree.JCTree;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
diff --git a/java.hints/src/org/netbeans/modules/java/hints/suggestions/ExpectedTypeResolver.java b/java.hints/src/org/netbeans/modules/java/hints/suggestions/ExpectedTypeResolver.java
index bab258a..8bf7951 100644
--- a/java.hints/src/org/netbeans/modules/java/hints/suggestions/ExpectedTypeResolver.java
+++ b/java.hints/src/org/netbeans/modules/java/hints/suggestions/ExpectedTypeResolver.java
@@ -122,7 +122,7 @@ import org.netbeans.modules.java.hints.errors.Utilities;
* it is not possible to determine a type which the expression must be <i>assignable to</i>. But it is known that the
* expression must be <i>castable</i> to the typecast's target type so that compiler error does not occur.
* <p/>
- * As the class iterates "upwards", it was derived from TreeVisitor rather than from ErrorAwareTreeScanner to prevent accidental
+ * As the class iterates "upwards", it was derived from TreeVisitor rather than from TreeScanner to prevent accidental
* StackOverflows if execution accidentally fall to the default implementation with top-down traversal.
*
* @author sdedic
diff --git a/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java b/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java
index aed9a9e..ede2a58 100644
--- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java
+++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/TreeRuleTestBase.java
@@ -39,13 +39,13 @@ import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.JavaSource.Phase;
import org.netbeans.api.java.source.SourceUtils;
import org.netbeans.api.java.source.SourceUtilsTestUtil;
+import org.netbeans.api.java.source.SourceUtilsTestUtil2;
import org.netbeans.api.java.source.TestUtilities;
import org.netbeans.api.lexer.Language;
import org.netbeans.junit.NbTestCase;
import org.netbeans.junit.RandomlyFails;
import org.netbeans.modules.java.hints.legacy.spi.RulesManager;
import org.netbeans.modules.java.hints.legacy.spi.RulesManager.LegacyHintConfiguration;
-//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;
@@ -74,8 +74,7 @@ public abstract class TreeRuleTestBase extends NbTestCase {
protected void setUp() throws Exception {
super.setUp();
SourceUtilsTestUtil.prepareTest(new String[] {"org/netbeans/modules/java/editor/resources/layer.xml"}, new Object[0]);
- //XXX:
-// TreeLoader.DISABLE_CONFINEMENT_TEST = true;
+ SourceUtilsTestUtil2.disableConfinementTest();
}
private void prepareTest(String fileName, String code) throws Exception {
diff --git a/java.hints/test/unit/src/org/netbeans/modules/java/hints/introduce/RefFinderTest.java b/java.hints/test/unit/src/org/netbeans/modules/java/hints/introduce/RefFinderTest.java
index 95022dd..be91008 100644
--- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/introduce/RefFinderTest.java
+++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/introduce/RefFinderTest.java
@@ -18,15 +18,11 @@
*/
package org.netbeans.modules.java.hints.introduce;
-import com.sun.source.tree.BlockTree;
import com.sun.source.tree.MethodTree;
import com.sun.source.tree.ReturnTree;
import com.sun.source.tree.StatementTree;
import com.sun.source.tree.Tree;
-import com.sun.source.util.TreePath;
-import org.netbeans.api.java.source.support.ErrorAwareTreePathScanner;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import javax.lang.model.element.ExecutableElement;
diff --git a/java.j2seprofiles/nbproject/project.properties b/java.j2seprofiles/nbproject/project.properties
index 7b21974..bd782ba 100644
--- a/java.j2seprofiles/nbproject/project.properties
+++ b/java.j2seprofiles/nbproject/project.properties
@@ -16,5 +16,4 @@
# under the License.
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
-cp.extra=${tools.jar}
requires.nb.javac=true
diff --git a/java.metrics/test/unit/src/org/netbeans/modules/java/metrics/hints/MethodMetricsTest.java b/java.metrics/test/unit/src/org/netbeans/modules/java/metrics/hints/MethodMetricsTest.java
index 4886081..fb7efc1 100644
--- a/java.metrics/test/unit/src/org/netbeans/modules/java/metrics/hints/MethodMetricsTest.java
+++ b/java.metrics/test/unit/src/org/netbeans/modules/java/metrics/hints/MethodMetricsTest.java
@@ -74,7 +74,7 @@ public class MethodMetricsTest extends NbTestCase {
}
/**
- * Runs the hints through code, which triggers all branches of ErrorAwareTreeScanner.
+ * Runs the hints through code, which triggers all branches of TreeScanner.
* This is just a sanity check that a hint does not throw exceptions on some
* construction; but will not catch all errors, obviously.
*/
diff --git a/java.module.graph/nbproject/project.xml b/java.module.graph/nbproject/project.xml
index dc2b425..cb3fbed 100644
--- a/java.module.graph/nbproject/project.xml
+++ b/java.module.graph/nbproject/project.xml
@@ -69,23 +69,14 @@
<specification-version>1.44</specification-version>
</run-dependency>
</dependency>
-<!-- <dependency>
+ <dependency>
<code-name-base>org.netbeans.libs.javacapi</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>8.19</specification-version>
</run-dependency>
- </dependency>-->
-<!-- <dependency>
- <code-name-base>org.netbeans.libs.javacimpl</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>0.42</specification-version>
- </run-dependency>
- </dependency>-->
+ </dependency>
<dependency>
<code-name-base>org.netbeans.modules.java.graph</code-name-base>
<build-prerequisite/>
diff --git a/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java b/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
index ff7760b..5f1b097 100644
--- a/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
+++ b/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
@@ -60,7 +60,6 @@ import com.sun.tools.javac.comp.Check;
import com.sun.tools.javac.model.JavacElements;
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
import com.sun.tools.javac.util.Context;
-
import java.util.function.Predicate;
import javax.swing.SwingUtilities;
diff --git a/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java b/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
index 5cbc2f0..d616476 100644
--- a/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
+++ b/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
@@ -95,6 +95,7 @@ import org.netbeans.lib.nbjavac.services.CancelService;
import org.netbeans.lib.nbjavac.services.NBParserFactory;
import org.netbeans.lib.nbjavac.services.NBResolve;
import org.netbeans.lib.nbjavac.services.NBTreeMaker.IndexedClassDecl;
+import org.netbeans.modules.java.source.TreeUtilitiesAccessor;
import org.netbeans.modules.java.source.builder.CommentHandlerService;
import org.netbeans.modules.java.source.builder.CommentSetImpl;
import org.netbeans.modules.java.source.pretty.ImportAnalysis2;
@@ -575,7 +576,11 @@ public final class TreeUtilities {
* @return parsed {@link StatementTree} or null?
*/
public StatementTree parseStatement(String stmt, SourcePositions[] sourcePositions) {
- return doParse(stmt, sourcePositions, 0, Parser::parseStatement);
+ return parseStatementImpl(info.impl.getJavacTask(), stmt, sourcePositions);
+ }
+
+ private static StatementTree parseStatementImpl(JavacTaskImpl task, String stmt, SourcePositions[] sourcePositions) {
+ return doParse(task, stmt, sourcePositions, 0, Parser::parseStatement);
}
/**Parses given expression.
@@ -618,16 +623,20 @@ public final class TreeUtilities {
* @return parsed {@link T} or null?
*/
private <T extends Tree> T doParse(String text, SourcePositions[] sourcePositions, int offset, Function<Parser, T> actualParse) {
+ return doParse(info.impl.getJavacTask(), text, sourcePositions, offset, actualParse);
+ }
+
+ private static <T extends Tree> T doParse(JavacTaskImpl task, String text, SourcePositions[] sourcePositions, int offset, Function<Parser, T> actualParse) {
if (text == null || (sourcePositions != null && sourcePositions.length != 1))
throw new IllegalArgumentException();
//use a working init order:
- com.sun.tools.javac.main.JavaCompiler.instance(info.impl.getJavacTask().getContext());
- com.sun.tools.javac.tree.TreeMaker jcMaker = com.sun.tools.javac.tree.TreeMaker.instance(info.impl.getJavacTask().getContext());
+ com.sun.tools.javac.main.JavaCompiler.instance(task.getContext());
+ com.sun.tools.javac.tree.TreeMaker jcMaker = com.sun.tools.javac.tree.TreeMaker.instance(task.getContext());
int oldPos = jcMaker.pos;
try {
//from org/netbeans/modules/java/hints/spiimpl/Utilities.java:
- Context context = info.impl.getJavacTask().getContext();
+ Context context = task.getContext();
JavaCompiler compiler = JavaCompiler.instance(context);
JavaFileObject prev = compiler.log.useSource(new DummyJFO());
Log.DiagnosticHandler discardHandler = new Log.DiscardDiagnosticHandler(compiler.log) {
@@ -1875,4 +1884,13 @@ public final class TreeUtilities {
return delegate.getLocalElements();
}
}
+
+ static {
+ TreeUtilitiesAccessor.setInstance(new TreeUtilitiesAccessor() {
+ @Override
+ public StatementTree parseStatement(JavacTaskImpl task, String stmt, SourcePositions[] sourcePositions) {
+ return parseStatementImpl(task, stmt, sourcePositions);
+ }
+ });
+ }
}
diff --git a/java.source.base/src/org/netbeans/api/java/source/TypeUtilities.java b/java.source.base/src/org/netbeans/api/java/source/TypeUtilities.java
index 865d03e..7093b93 100644
--- a/java.source.base/src/org/netbeans/api/java/source/TypeUtilities.java
+++ b/java.source.base/src/org/netbeans/api/java/source/TypeUtilities.java
@@ -26,14 +26,12 @@ import com.sun.tools.javac.code.Type.TypeVar;
import com.sun.tools.javac.code.TypeTag;
import com.sun.tools.javac.code.Types;
import com.sun.tools.javac.model.JavacTypes;
-
import java.util.Arrays;
import java.util.EnumSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-
import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.ArrayType;
@@ -45,7 +43,6 @@ import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.TypeVariable;
import javax.lang.model.type.WildcardType;
import javax.lang.model.util.SimpleTypeVisitor6;
-
import org.netbeans.api.annotations.common.CheckReturnValue;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;
diff --git a/java.source.base/src/org/netbeans/modules/java/source/JavaSourceUtilImpl.java b/java.source.base/src/org/netbeans/modules/java/source/JavaSourceUtilImpl.java
index 03e0e5e..6c6b060 100644
--- a/java.source.base/src/org/netbeans/modules/java/source/JavaSourceUtilImpl.java
+++ b/java.source.base/src/org/netbeans/modules/java/source/JavaSourceUtilImpl.java
@@ -24,7 +24,6 @@ import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.tree.ModuleTree;
import com.sun.source.tree.Tree;
import com.sun.source.util.TreePath;
-import org.netbeans.api.java.source.support.ErrorAwareTreePathScanner;
import org.netbeans.api.java.source.support.ErrorAwareTreeScanner;
import com.sun.source.util.Trees;
import com.sun.tools.javac.code.ClassFinder;
@@ -32,7 +31,6 @@ import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symtab;
import com.sun.tools.javac.util.Name;
import com.sun.tools.javac.api.JavacTaskImpl;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
@@ -52,7 +50,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-
import javax.lang.model.element.ModuleElement;
import javax.lang.model.element.TypeElement;
import javax.tools.Diagnostic;
@@ -60,7 +57,6 @@ import javax.tools.DiagnosticListener;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.StandardLocation;
-
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;
diff --git a/java.source.base/src/org/netbeans/modules/java/source/TreeUtilitiesAccessor.java b/java.source.base/src/org/netbeans/modules/java/source/TreeUtilitiesAccessor.java
new file mode 100644
index 0000000..a6c3350
--- /dev/null
+++ b/java.source.base/src/org/netbeans/modules/java/source/TreeUtilitiesAccessor.java
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.java.source;
+
+import com.sun.source.tree.StatementTree;
+import com.sun.source.util.SourcePositions;
+import com.sun.tools.javac.api.JavacTaskImpl;
+import org.netbeans.api.java.source.TreeUtilities;
+
+/**
+ *
+ * @author lahvac
+ */
+public abstract class TreeUtilitiesAccessor {
+
+ private static volatile TreeUtilitiesAccessor INSTANCE;
+
+ public static TreeUtilitiesAccessor getInstance() {
+ TreeUtilitiesAccessor result = INSTANCE;
+
+ if (result == null) {
+ synchronized (TreeUtilitiesAccessor.class) {
+ if (INSTANCE == null) {
+ Class c = TreeUtilities.class;
+ try {
+ Class.forName(c.getName(), true, c.getClassLoader());
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ assert INSTANCE != null;
+ }
+
+ return INSTANCE;
+ }
+ }
+
+ return result;
+ }
+
+ public static void setInstance(TreeUtilitiesAccessor instance) {
+ assert instance != null;
+ INSTANCE = instance;
+ }
+
+ protected TreeUtilitiesAccessor() {
+ }
+
+ public abstract StatementTree parseStatement(JavacTaskImpl task, String stmt, SourcePositions[] sourcePositions);
+
+}
diff --git a/java.source.base/src/org/netbeans/modules/java/source/parsing/FileObjects.java b/java.source.base/src/org/netbeans/modules/java/source/parsing/FileObjects.java
index e8acfdb..5644dcf 100644
--- a/java.source.base/src/org/netbeans/modules/java/source/parsing/FileObjects.java
+++ b/java.source.base/src/org/netbeans/modules/java/source/parsing/FileObjects.java
@@ -139,6 +139,7 @@ public class FileObjects {
private static final Set<String> javaFlavorExt = new HashSet<String>();
static {
javaFlavorExt.add("btrace"); //NOI18N
+ javaFlavorExt.add("jsh"); //NOI18N
}
/** Creates a new instance of FileObjects */
diff --git a/java.source.base/src/org/netbeans/modules/java/source/save/Reindenter.java b/java.source.base/src/org/netbeans/modules/java/source/save/Reindenter.java
index 99b2f7c..c0e247e 100644
--- a/java.source.base/src/org/netbeans/modules/java/source/save/Reindenter.java
+++ b/java.source.base/src/org/netbeans/modules/java/source/save/Reindenter.java
@@ -76,6 +76,7 @@ import org.netbeans.modules.editor.indent.spi.Context.Region;
import org.netbeans.modules.editor.indent.spi.ExtraLock;
import org.netbeans.modules.editor.indent.spi.IndentTask;
import org.netbeans.modules.java.source.NoJavacHelper;
+import org.netbeans.modules.java.source.TreeUtilitiesAccessor;
import org.netbeans.modules.java.source.parsing.FileObjects;
import org.netbeans.modules.java.source.parsing.JavacParser;
import org.netbeans.modules.java.source.parsing.ParsingUtils;
@@ -232,21 +233,20 @@ public class Reindenter implements IndentTask {
parsedTree = cut;
sp = JavacTrees.instance(ctx).getSourcePositions();
} else {
-// final SourcePositions[] psp = new SourcePositions[1];
-// cut = null;
-// parsedTree = javacTask.parseStatement("{" + text + "}", psp);
-// sp = new SourcePositions() {
-// @Override
-// public long getStartPosition(CompilationUnitTree file, Tree tree) {
-// return currentEmbeddingStartOffset + psp[0].getStartPosition(file, tree) - 1;
-// }
-//
-// @Override
-// public long getEndPosition(CompilationUnitTree file, Tree tree) {
-// return currentEmbeddingStartOffset + psp[0].getEndPosition(file, tree) - 1;
-// }
-// };
- throw new UnsupportedOperationException("TODO");
+ final SourcePositions[] psp = new SourcePositions[1];
+ cut = null;
+ parsedTree = TreeUtilitiesAccessor.getInstance().parseStatement(javacTask, "{" + text + "}", psp);
+ sp = new SourcePositions() {
+ @Override
+ public long getStartPosition(CompilationUnitTree file, Tree tree) {
+ return currentEmbeddingStartOffset + psp[0].getStartPosition(file, tree) - 1;
+ }
+
+ @Override
+ public long getEndPosition(CompilationUnitTree file, Tree tree) {
+ return currentEmbeddingStartOffset + psp[0].getEndPosition(file, tree) - 1;
+ }
+ };
}
} catch (Exception ex) {
return false;
diff --git a/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java b/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java
index 91bb77e..b85f02d 100644
--- a/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java
+++ b/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java
@@ -30,7 +30,7 @@ import org.netbeans.modules.java.source.indexing.CompileWorker.ParsingOutput;
import org.netbeans.modules.java.source.indexing.JavaCustomIndexer.CompileTuple;
import org.netbeans.modules.parsing.spi.indexing.Context;
-/**TODO: this test needs to run with vanilla javac
+/**
*
* @author lahvac
*/
@@ -60,7 +60,6 @@ public class VanillaCompileWorkerTest extends CompileWorkerTestBase {
createdFiles.add(getWorkDir().toURI().relativize(created.toURI()).getPath());
}
- //TODO:
assertEquals(new HashSet<String>(Arrays.asList("cache/s1/java/15/classes/test/Test3.sig",
"cache/s1/java/15/classes/test/Test4.sig")), createdFiles);
result = runIndexing(Arrays.asList(compileTuple("test/Test4.java", "package test; public class Test4 { void t() { Undef undef; } }")),
@@ -83,7 +82,6 @@ public class VanillaCompileWorkerTest extends CompileWorkerTestBase {
createdFiles.add(getWorkDir().toURI().relativize(created.toURI()).getPath());
}
- //TODO:
assertEquals(new HashSet<String>(Arrays.asList("cache/s1/java/15/classes/test/Test4.sig")), createdFiles);
}
@@ -100,7 +98,6 @@ public class VanillaCompileWorkerTest extends CompileWorkerTestBase {
createdFiles.add(getWorkDir().toURI().relativize(created.toURI()).getPath());
}
- //TODO:
assertEquals(new HashSet<String>(Arrays.asList("cache/s1/java/15/classes/test/Test4.sig")), createdFiles);
//TODO: check file content!!!
}
@@ -118,7 +115,6 @@ public class VanillaCompileWorkerTest extends CompileWorkerTestBase {
createdFiles.add(getWorkDir().toURI().relativize(created.toURI()).getPath());
}
- //TODO:
assertEquals(new HashSet<String>(Arrays.asList("cache/s1/java/15/classes/test/Test4.sig")), createdFiles);
//TODO: check file content!!!
}
@@ -136,7 +132,6 @@ public class VanillaCompileWorkerTest extends CompileWorkerTestBase {
createdFiles.add(getWorkDir().toURI().relativize(created.toURI()).getPath());
}
- //TODO:
assertEquals(new HashSet<String>(Arrays.asList("cache/s1/java/15/classes/test/Test4.sig")), createdFiles);
//TODO: check file content!!!
}
@@ -154,7 +149,6 @@ public class VanillaCompileWorkerTest extends CompileWorkerTestBase {
createdFiles.add(getWorkDir().toURI().relativize(created.toURI()).getPath());
}
- //TODO:
assertEquals(new HashSet<String>(Arrays.asList("cache/s1/java/15/classes/test/Test4.sig",
"cache/s1/java/15/classes/test/Test4$1.sig")),
createdFiles);
@@ -174,7 +168,6 @@ public class VanillaCompileWorkerTest extends CompileWorkerTestBase {
createdFiles.add(getWorkDir().toURI().relativize(created.toURI()).getPath());
}
- //TODO:
assertEquals(new HashSet<String>(Arrays.asList("cache/s1/java/15/classes/test/Test4.sig")),
createdFiles);
//TODO: check file content!!!
diff --git a/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/indexing/MultiPassCompileWorker.java b/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/indexing/MultiPassCompileWorker.java
index 116e31f..629d01c 100644
--- a/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/indexing/MultiPassCompileWorker.java
+++ b/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/indexing/MultiPassCompileWorker.java
@@ -61,13 +61,13 @@ import org.netbeans.api.java.queries.CompilerOptionsQuery;
import org.netbeans.api.java.source.ClasspathInfo;
import org.netbeans.api.java.source.ElementHandle;
import org.netbeans.modules.java.source.indexing.APTUtils;
-//import org.netbeans.modules.java.source.TreeLoader;
import org.netbeans.modules.java.source.indexing.CompileWorker;
import org.netbeans.modules.java.source.indexing.DiagnosticListenerImpl;
import org.netbeans.modules.java.source.indexing.JavaCustomIndexer;
import org.netbeans.modules.java.source.indexing.JavaCustomIndexer.CompileTuple;
import org.netbeans.modules.java.source.indexing.JavaIndex;
import org.netbeans.modules.java.source.indexing.JavaParsingContext;
+import org.netbeans.modules.java.source.nbjavac.parsing.TreeLoader;
import org.netbeans.modules.java.source.parsing.FileObjects;
import org.netbeans.modules.java.source.parsing.JavacParser;
import org.netbeans.modules.java.source.parsing.OutputFileManager;
@@ -349,7 +349,7 @@ final class MultiPassCompileWorker extends CompileWorker {
}
} catch (CouplingAbort ca) {
//Coupling error
-// TreeLoader.dumpCouplingAbort(ca, null);
+ TreeLoader.dumpCouplingAbort(ca, null);
jt = null;
diagnosticListener.cleanDiagnostics();
if ((state & ERR) != 0) {
@@ -472,8 +472,8 @@ final class MultiPassCompileWorker extends CompileWorker {
if (stEnv != null && env != stEnv) {
if (checked.add(stEnv)) {
scan(stEnv.tree);
-// if (TreeLoader.pruneTree(stEnv.tree, syms, syms2trees))
-// dependencies.add(stEnv);
+ if (TreeLoader.pruneTree(stEnv.tree, syms, syms2trees))
+ dependencies.add(stEnv);
}
envForSuperTypeFound = true;
}
@@ -494,8 +494,8 @@ final class MultiPassCompileWorker extends CompileWorker {
dumpSymFile(jfm, jti, dep.enclClass.sym, alreadyCreated, classes, syms2trees);
}
}
-// if (TreeLoader.pruneTree(env.tree, syms, syms2trees))
-// dumpSymFile(jfm, jti, env.enclClass.sym, alreadyCreated, classes, syms2trees);
+ if (TreeLoader.pruneTree(env.tree, syms, syms2trees))
+ dumpSymFile(jfm, jti, env.enclClass.sym, alreadyCreated, classes, syms2trees);
}
}
} finally {
@@ -519,7 +519,7 @@ final class MultiPassCompileWorker extends CompileWorker {
JavaFileObject file = jfm.getJavaFileForOutput(StandardLocation.CLASS_OUTPUT,
cs.flatname.toString(), JavaFileObject.Kind.CLASS, cs.sourcefile);
if (file instanceof FileObjects.FileBase && !alreadyCreated.contains(((FileObjects.FileBase)file).getFile())) {
-// TreeLoader.dumpSymFile(jfm, jti, cs, classes, syms2trees);
+ TreeLoader.dumpSymFile(jfm, jti, cs, classes, syms2trees);
}
}
}
diff --git a/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/indexing/OnePassCompileWorker.java b/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/indexing/OnePassCompileWorker.java
index 6a59ba0..3cae20c 100644
--- a/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/indexing/OnePassCompileWorker.java
+++ b/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/indexing/OnePassCompileWorker.java
@@ -42,7 +42,6 @@ import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import javax.annotation.processing.Processor;
import javax.lang.model.element.Element;
import javax.lang.model.element.ModuleElement;
import javax.lang.model.element.TypeElement;
@@ -53,7 +52,6 @@ import org.netbeans.api.java.source.ClasspathInfo;
import org.netbeans.api.java.source.ElementHandle;
import org.netbeans.lib.nbjavac.services.CancelAbort;
import org.netbeans.lib.nbjavac.services.CancelService;
-//import org.netbeans.modules.java.source.TreeLoader;
import org.netbeans.modules.java.source.indexing.APTUtils;
import org.netbeans.modules.java.source.indexing.CompileWorker;
import org.netbeans.modules.java.source.indexing.DiagnosticListenerImpl;
@@ -62,6 +60,7 @@ import org.netbeans.modules.java.source.indexing.JavaCustomIndexer.CompileTuple;
import org.netbeans.modules.java.source.indexing.JavaIndex;
import org.netbeans.modules.java.source.indexing.JavaParsingContext;
import org.netbeans.modules.java.source.indexing.SourcePrefetcher;
+import org.netbeans.modules.java.source.nbjavac.parsing.TreeLoader;
import org.netbeans.modules.java.source.parsing.FileManagerTransaction;
import org.netbeans.modules.java.source.parsing.FileObjects;
import org.netbeans.modules.java.source.parsing.JavacParser;
@@ -316,7 +315,7 @@ final class OnePassCompileWorker extends CompileWorker {
return ParsingOutput.success(moduleName.name, file2FQNs, addedTypes, addedModules, createdFiles, finished, modifiedTypes, aptGenerated);
} catch (CouplingAbort ca) {
//Coupling error
-// TreeLoader.dumpCouplingAbort(ca, null);
+ TreeLoader.dumpCouplingAbort(ca, null);
} catch (OutputFileManager.InvalidSourcePath isp) {
//Deleted project - log & ignore
if (JavaIndex.LOG.isLoggable(Level.FINEST)) {
diff --git a/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/indexing/SuperOnePassCompileWorker.java b/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/indexing/SuperOnePassCompileWorker.java
index fd5109d..85e71ca 100644
--- a/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/indexing/SuperOnePassCompileWorker.java
+++ b/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/indexing/SuperOnePassCompileWorker.java
@@ -55,7 +55,6 @@ import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.queries.CompilerOptionsQuery;
import org.netbeans.api.java.source.ClasspathInfo;
import org.netbeans.api.java.source.ElementHandle;
-//import org.netbeans.modules.java.source.TreeLoader;
import org.netbeans.modules.java.source.indexing.APTUtils;
import org.netbeans.modules.java.source.indexing.CompileWorker;
import org.netbeans.modules.java.source.indexing.DiagnosticListenerImpl;
@@ -64,6 +63,7 @@ import org.netbeans.modules.java.source.indexing.JavaCustomIndexer.CompileTuple;
import org.netbeans.modules.java.source.indexing.JavaIndex;
import org.netbeans.modules.java.source.indexing.JavaParsingContext;
import org.netbeans.modules.java.source.indexing.SourcePrefetcher;
+import org.netbeans.modules.java.source.nbjavac.parsing.TreeLoader;
import org.netbeans.modules.java.source.parsing.FileManagerTransaction;
import org.netbeans.modules.java.source.parsing.FileObjects;
import org.netbeans.modules.java.source.parsing.JavacParser;
@@ -321,7 +321,7 @@ final class SuperOnePassCompileWorker extends CompileWorker {
return ParsingOutput.success(moduleName.name, file2FQNs, addedTypes, addedModules, createdFiles, finished, modifiedTypes, aptGenerated);
} catch (CouplingAbort ca) {
//Coupling error
-// TreeLoader.dumpCouplingAbort(ca, null);
+ TreeLoader.dumpCouplingAbort(ca, null);
} catch (OutputFileManager.InvalidSourcePath isp) {
//Deleted project - log & ignore
if (JavaIndex.LOG.isLoggable(Level.FINEST)) {
diff --git a/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/parsing/PartialReparserImpl.java b/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/parsing/PartialReparserImpl.java
index a3c7975..37c3474 100644
--- a/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/parsing/PartialReparserImpl.java
+++ b/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/parsing/PartialReparserImpl.java
@@ -111,10 +111,10 @@ public class PartialReparserImpl implements PartialReparser {
final int firstInner = fav.firstInner;
final int noInner = fav.noInner;
final Context ctx = task.getContext();
-// final TreeLoader treeLoader = TreeLoader.instance(ctx);
-// if (treeLoader != null) {
-// treeLoader.startPartialReparse();
-// }
+ final TreeLoader treeLoader = TreeLoader.instance(ctx);
+ if (treeLoader != null) {
+ treeLoader.startPartialReparse();
+ }
try {
final Log l = Log.instance(ctx);
l.startPartialReparse();
@@ -202,9 +202,9 @@ public class PartialReparserImpl implements PartialReparser {
}
ci.update(snapshot);
} finally {
-// if (treeLoader != null) {
-// treeLoader.endPartialReparse();
-// }
+ if (treeLoader != null) {
+ treeLoader.endPartialReparse();
+ }
}
} catch (CouplingAbort ca) {
//Needs full reparse
diff --git a/java.source.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/CouplingTest.java b/java.source.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/CouplingTest.java
index ba71616..e5b1bbf 100644
--- a/java.source.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/CouplingTest.java
+++ b/java.source.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/CouplingTest.java
@@ -45,7 +45,7 @@ import javax.tools.StandardLocation;
import javax.tools.ToolProvider;
import junit.framework.TestCase;
-/**XXX: why is this passing?????
+/**TODO: finished?
*
* @author lahvac
*/
diff --git a/java.sourceui/test/unit/src/org/netbeans/api/java/source/ui/ElementHeadersTest.java b/java.sourceui/test/unit/src/org/netbeans/api/java/source/ui/ElementHeadersTest.java
index 077bfbd..af41e11 100644
--- a/java.sourceui/test/unit/src/org/netbeans/api/java/source/ui/ElementHeadersTest.java
+++ b/java.sourceui/test/unit/src/org/netbeans/api/java/source/ui/ElementHeadersTest.java
@@ -29,11 +29,11 @@ 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.SourceUtilsTestUtil2;
import org.netbeans.api.java.source.TestUtilities;
import org.netbeans.api.lexer.Language;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.JavaDataLoader;
-//import org.netbeans.modules.java.source.TreeLoader;
import org.openide.cookies.EditorCookie;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
@@ -121,7 +121,7 @@ public class ElementHeadersTest extends NbTestCase {
}
public void test134664() throws Exception {
-// TreeLoader.DISABLE_CONFINEMENT_TEST = true;
+ SourceUtilsTestUtil2.disableConfinementTest();
performTest("test/Test.java", "package test; public class Test { public Tfst {} }", 43, ElementHeaders.NAME, "Tfst");
}
}
diff --git a/java.testrunner.ui/nbproject/project.properties b/java.testrunner.ui/nbproject/project.properties
index 5fdc82a..375b088 100644
--- a/java.testrunner.ui/nbproject/project.properties
+++ b/java.testrunner.ui/nbproject/project.properties
@@ -17,5 +17,4 @@
is.eager=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
-cp.extra=${tools.jar}
requires.nb.javac=true
diff --git a/javafx2.editor/test/unit/src/org/netbeans/modules/javafx2/editor/FXMLCompletionTestBase.java b/javafx2.editor/test/unit/src/org/netbeans/modules/javafx2/editor/FXMLCompletionTestBase.java
index f82a8c2..60a6160 100644
--- a/javafx2.editor/test/unit/src/org/netbeans/modules/javafx2/editor/FXMLCompletionTestBase.java
+++ b/javafx2.editor/test/unit/src/org/netbeans/modules/javafx2/editor/FXMLCompletionTestBase.java
@@ -46,7 +46,6 @@ import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.editor.completion.CompletionItemComparator;
import org.netbeans.modules.editor.java.Utilities;
import org.netbeans.modules.java.JavaDataLoader;
-//import org.netbeans.modules.java.source.TreeLoader;
import org.netbeans.modules.java.source.indexing.TransactionContext;
import org.netbeans.modules.java.source.parsing.JavacParserFactory;
import org.netbeans.modules.java.source.usages.BinaryAnalyser;
diff --git a/jshell.support/nbproject/project.xml b/jshell.support/nbproject/project.xml
index 313c930..0bf4e11 100644
--- a/jshell.support/nbproject/project.xml
+++ b/jshell.support/nbproject/project.xml
@@ -120,15 +120,6 @@
<specification-version>8.19</specification-version>
</run-dependency>
</dependency>
-<!-- <dependency>
- <code-name-base>org.netbeans.libs.javacimpl</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>0.47</specification-version>
- </run-dependency>
- </dependency>-->
<dependency>
<code-name-base>org.netbeans.libs.jshell.compile</code-name-base>
<build-prerequisite/>
diff --git a/junit.ui/nbproject/project.properties b/junit.ui/nbproject/project.properties
index 5fdc82a..375b088 100644
--- a/junit.ui/nbproject/project.properties
+++ b/junit.ui/nbproject/project.properties
@@ -17,5 +17,4 @@
is.eager=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
-cp.extra=${tools.jar}
requires.nb.javac=true
diff --git a/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/AnonymousNumberingTest.java b/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/AnonymousNumberingTest.java
index 9d75995..803ef2d 100644
--- a/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/AnonymousNumberingTest.java
+++ b/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/AnonymousNumberingTest.java
@@ -21,11 +21,8 @@ package org.netbeans.lib.nbjavac.services;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.tools.javac.api.JavacTaskImpl;
-import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symtab;
import com.sun.tools.javac.comp.Modules;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.Name;
import java.io.IOException;
import javax.lang.model.element.Element;
@@ -64,14 +61,7 @@ public class AnonymousNumberingTest extends TestCase {
Iterable<? extends CompilationUnitTree> cuts = ct.parse();
Iterable<? extends Element> analyze = ct.analyze();
- System.err.println("repair: " + Class.forName("com.sun.tools.javac.comp.Repair"));
Symtab symTab = Symtab.instance(ct.getContext());
-
- for (Symbol.ClassSymbol cs : symTab.getAllClasses()) {
- if (cs.flatname.toString().contains("test.Test")) {
- System.err.println("XXX");
- }
- }
Modules modules = Modules.instance(ct.getContext());
TypeElement first = symTab.getClass(modules.getDefaultModule(), (Name)ct.getElements().getName("test.Test$1"));
TypeElement second = symTab.getClass(modules.getDefaultModule(), (Name)ct.getElements().getName("test.Test$2"));
diff --git a/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBClassWriterTest.java b/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBClassWriterTest.java
index baa0e52..6dd9bda 100644
--- a/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBClassWriterTest.java
+++ b/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBClassWriterTest.java
@@ -21,7 +21,6 @@ package org.netbeans.lib.nbjavac.services;
import com.sun.tools.javac.api.JavacTaskImpl;
import com.sun.tools.javac.api.JavacTool;
import com.sun.tools.javac.util.Context;
-import com.sun.tools.javadoc.main.JavadocClassFinder;
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -94,7 +93,6 @@ public class NBClassWriterTest extends NbTestCase {
final JavacTaskImpl ct = (JavacTaskImpl) ((JavacTool)tool).getTask(null, std, null, Arrays.asList("-bootclasspath", bootPath, "-source", "1.6", "-target", "1.6"), null, Arrays.asList(new MyFileObject(code)), context);
NBClassReader.preRegister(ct.getContext());
-// JavadocClassFinder.preRegister(ct.getContext());
NBClassWriter.preRegister(ct.getContext());
ct.call();
@@ -115,7 +113,6 @@ public class NBClassWriterTest extends NbTestCase {
JavacTaskImpl ct = (JavacTaskImpl)((JavacTool)tool).getTask(null, std, null, Arrays.asList("-bootclasspath", bootPath, "-source", "1.8", "-target", "1.8"), null, Arrays.<JavaFileObject>asList(), context);
NBClassReader.preRegister(ct.getContext());
-// JavadocClassFinder.preRegister(ct.getContext());
NBClassWriter.preRegister(ct.getContext());
PackageElement pack = ct.getElements().getPackageElement(packageName);
diff --git a/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/Utilities.java b/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/Utilities.java
index ab8cc7a..ca52d7f 100644
--- a/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/Utilities.java
+++ b/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/Utilities.java
@@ -52,13 +52,8 @@ public class Utilities {
//need to preregister the Messages here, because the getTask below requires Log instance:
Messager.preRegister(context, null, DEV_NULL, DEV_NULL, DEV_NULL);
JavacTaskImpl task = (JavacTaskImpl)JavacTool.create().getTask(null,
- fm, new DiagnosticListener<JavaFileObject>() {
- @Override
- public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
- System.err.println("diagnostic= " + diagnostic);
- }
- }
- , Arrays.asList("-bootclasspath", bootPath, "-source", version, "-target", version, "-Xjcov", "-XDshouldStopPolicy=GENERATE"), null, Arrays.asList(sources),
+ fm,
+ null, Arrays.asList("-bootclasspath", bootPath, "-source", version, "-target", version, "-Xjcov", "-XDshouldStopPolicy=GENERATE"), null, Arrays.asList(sources),
context);
NBParserFactory.preRegister(context);
NBTreeMaker.preRegister(context);
diff --git a/libs.javacapi/build.xml b/libs.javacapi/build.xml
index 216907d..320351c 100644
--- a/libs.javacapi/build.xml
+++ b/libs.javacapi/build.xml
@@ -27,11 +27,9 @@
<target name="-release.files-build-javac" if="nb-javac.exists">
<ant dir="../nb-javac/make/netbeans/nb-javac" target="jar" inheritAll="false"/>
<copy file="../nb-javac/make/netbeans/nb-javac/dist/javac-api.jar" tofile="external/nb-javac-api.jar" overwrite="true"/>
-<!-- <property name="release.files.extra" value="modules/ext/nb-javac-api.jar"/>-->
</target>
<target name="-release.files-delegate" unless="nb-javac.exists">
<antcall target="projectized.-release.files" />
-<!-- <property name="release.files.extra" value="modules/ext/nb-javac-api.jar"/>-->
</target>
<target name="-release.files" depends="-check-nb-javac-exists,-release.files-build-javac,-release.files-delegate" />
</project>
diff --git a/libs.javacapi/manifest.mf b/libs.javacapi/manifest.mf
index 7a11322..5177edf 100644
--- a/libs.javacapi/manifest.mf
+++ b/libs.javacapi/manifest.mf
@@ -4,4 +4,3 @@ OpenIDE-Module-Implementation-Version: 3
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javacapi/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/libs/javacapi/layer.xml
OpenIDE-Module-Requires: org.openide.modules.ModuleFormat2
-XOpenIDE-Module-Hide-Classpath-Packages: com.sun.javadoc.**, com.sun.source.**, javax.annotation.processing.**, javax.lang.model.**, javax.tools.**, com.sun.tools.javac.** com.sun.tools.javac.**, com.sun.tools.javadoc.**, com.sun.tools.javap.**, com.sun.tools.classfile.**, com.sun.tools.doclint.**
diff --git a/libs.javacimpl/build.xml b/libs.javacimpl/build.xml
index 9cef228..678feb1 100644
--- a/libs.javacimpl/build.xml
+++ b/libs.javacimpl/build.xml
@@ -27,11 +27,9 @@
<target name="-release.files-build-javac" if="nb-javac.exists">
<ant dir="../nb-javac/make/netbeans/nb-javac" target="jar" inheritAll="false"/>
<copy file="../nb-javac/make/netbeans/nb-javac/dist/javac-impl.jar" tofile="external/nb-javac-impl.jar" overwrite="true"/>
-<!-- <property name="release.files.extra" value="modules/ext/nb-javac-impl.jar"/>-->
</target>
<target name="-release.files-delegate" unless="nb-javac.exists">
<antcall target="projectized.-release.files" />
-<!-- <property name="release.files.extra" value="modules/ext/nb-javac-impl.jar"/>-->
</target>
<target name="-release.files" depends="-check-nb-javac-exists,-release.files-build-javac,-release.files-delegate" />
</project>
diff --git a/libs.javacimpl/manifest.mf b/libs.javacimpl/manifest.mf
index e0ab3ac..b7e1087 100644
--- a/libs.javacimpl/manifest.mf
+++ b/libs.javacimpl/manifest.mf
@@ -3,5 +3,3 @@ OpenIDE-Module: org.netbeans.libs.javacimpl/1
OpenIDE-Module-Implementation-Version: 25
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javacimpl/Bundle.properties
OpenIDE-Module-Requires: org.openide.modules.ModuleFormat2
-xOpenIDE-Module-Hide-Classpath-Packages: com.sun.tools.javac.**, com.sun.tools.javadoc.**, com.sun.tools.javap.**, com.sun.tools.classfile.**, com.sun.tools.doclint.**
-xOpenIDE-Module-Fragment-Host: org.netbeans.libs.javacapi
diff --git a/libs.javacimpl/nbproject/project.properties b/libs.javacimpl/nbproject/project.properties
index a401289..d7c28a6 100644
--- a/libs.javacimpl/nbproject/project.properties
+++ b/libs.javacimpl/nbproject/project.properties
@@ -19,7 +19,6 @@ javac.source=1.6
nbm.homepage=http://jackpot.netbeans.org/
nbm.module.author=Petr Hrebejk
spec.version.base=0.48.0
-#release.external/nb-javac-impl.jar=modules/ext/nb-javac-impl.jar
javadoc.arch=${basedir}/arch.xml
diff --git a/libs.jshell.compile/nbproject/project.xml b/libs.jshell.compile/nbproject/project.xml
index eebd342..0b49f77 100644
--- a/libs.jshell.compile/nbproject/project.xml
+++ b/libs.jshell.compile/nbproject/project.xml
@@ -25,23 +25,6 @@
<data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
<code-name-base>org.netbeans.libs.jshell.compile</code-name-base>
<module-dependencies>
-<!-- <dependency>
- <code-name-base>org.netbeans.libs.javacapi</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>8.19</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.libs.javacimpl</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>0.47</specification-version>
- </run-dependency>
- </dependency>-->
<dependency>
<code-name-base>org.netbeans.lib.nbjshell</code-name-base>
<run-dependency>
diff --git a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/NFABasedBulkSearch.java b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/NFABasedBulkSearch.java
index e22140a..034c8d8 100644
--- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/NFABasedBulkSearch.java
+++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/NFABasedBulkSearch.java
@@ -32,7 +32,6 @@ 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 org.netbeans.api.java.source.support.ErrorAwareTreeScanner;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
diff --git a/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/TestBase.java b/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/TestBase.java
index 783dc67..e57c86a 100644
--- a/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/TestBase.java
+++ b/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/TestBase.java
@@ -28,10 +28,10 @@ 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.SourceUtilsTestUtil2;
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;
@@ -51,8 +51,7 @@ public class TestBase extends NbTestCase {
protected void setUp() throws Exception {
super.setUp();
SourceUtilsTestUtil.prepareTest(new String[0], new Object[0]);
- //XXX:
-// TreeLoader.DISABLE_CONFINEMENT_TEST = true;
+ SourceUtilsTestUtil2.disableConfinementTest();
clearWorkDir();
FileUtil.refreshFor(File.listRoots());
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 075de99..ac28111 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,12 +51,12 @@ 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.api.java.source.SourceUtilsTestUtil2;
import org.netbeans.junit.RandomlyFails;
/**
@@ -73,8 +73,7 @@ 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]);
- //XXX:
-// TreeLoader.DISABLE_CONFINEMENT_TEST = true;
+ SourceUtilsTestUtil2.disableConfinementTest();
}
// public static TestSuite suite() {
--
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org