diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ffc07cdb2792..d8ae86c668f7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1424,10 +1424,10 @@ jobs: timeout-minutes: 60 strategy: matrix: - java: [ '17', '22' ] + java: [ '17', '23-ea' ] config: [ 'batch1', 'batch2' ] exclude: - - java: ${{ github.event_name == 'pull_request' && 'nothing' || '22' }} + - java: ${{ github.event_name == 'pull_request' && 'nothing' || '23-ea' }} fail-fast: false steps: diff --git a/java/debugger.jpda/nbproject/org-netbeans-modules-debugger-jpda.sig b/java/debugger.jpda/nbproject/org-netbeans-modules-debugger-jpda.sig index ff7e81c19f7c..b9e4f7f67c2e 100644 --- a/java/debugger.jpda/nbproject/org-netbeans-modules-debugger-jpda.sig +++ b/java/debugger.jpda/nbproject/org-netbeans-modules-debugger-jpda.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 1.133.0 +#Version 1.134.0 CLSS public abstract interface com.sun.source.tree.TreeVisitor<%0 extends java.lang.Object, %1 extends java.lang.Object> meth public abstract {com.sun.source.tree.TreeVisitor%0} visitAnnotatedType(com.sun.source.tree.AnnotatedTypeTree,{com.sun.source.tree.TreeVisitor%1}) @@ -56,7 +56,6 @@ meth public abstract {com.sun.source.tree.TreeVisitor%0} visitPrimitiveType(com. meth public abstract {com.sun.source.tree.TreeVisitor%0} visitProvides(com.sun.source.tree.ProvidesTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitRequires(com.sun.source.tree.RequiresTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitReturn(com.sun.source.tree.ReturnTree,{com.sun.source.tree.TreeVisitor%1}) -meth public abstract {com.sun.source.tree.TreeVisitor%0} visitStringTemplate(com.sun.source.tree.StringTemplateTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSwitch(com.sun.source.tree.SwitchTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSwitchExpression(com.sun.source.tree.SwitchExpressionTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSynchronized(com.sun.source.tree.SynchronizedTree,{com.sun.source.tree.TreeVisitor%1}) @@ -140,7 +139,6 @@ meth public {com.sun.source.util.TreeScanner%0} visitPrimitiveType(com.sun.sourc meth public {com.sun.source.util.TreeScanner%0} visitProvides(com.sun.source.tree.ProvidesTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitRequires(com.sun.source.tree.RequiresTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitReturn(com.sun.source.tree.ReturnTree,{com.sun.source.util.TreeScanner%1}) -meth public {com.sun.source.util.TreeScanner%0} visitStringTemplate(com.sun.source.tree.StringTemplateTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSwitch(com.sun.source.tree.SwitchTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSwitchExpression(com.sun.source.tree.SwitchExpressionTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSynchronized(com.sun.source.tree.SynchronizedTree,{com.sun.source.util.TreeScanner%1}) diff --git a/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java b/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java index 9a2d8de48307..9ec7273f86f6 100644 --- a/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java +++ b/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java @@ -500,9 +500,6 @@ protected void resolve(CompilationController controller) throws IOException { case DECONSTRUCTION_PATTERN: insideDeconstructionRecordPattern(env); break; - case TEMPLATE: - insideStringTemplate(env); - break; } } @@ -3395,16 +3392,6 @@ private boolean isSealedSupported(final Env env) { return env.getController().getSourceVersion().compareTo(SourceVersion.RELEASE_15) >= 0; } - private void insideStringTemplate(Env env) throws IOException { - final int offset = env.getOffset(); - final TreePath path = env.getPath(); - TokenSequence ts = findLastNonWhitespaceToken(env, path.getLeaf(), offset); - if (ts.token().id() == JavaTokenId.STRING_LITERAL || ts.token().id() == JavaTokenId.MULTILINE_STRING_LITERAL) { - localResult(env); - addValueKeywords(env); - } - } - private void localResult(Env env) throws IOException { addLocalMembersAndVars(env); addClassTypes(env, null); @@ -6186,10 +6173,6 @@ public boolean accept(Element e, TypeMirror t) { break; case BLOCK: return null; - case TEMPLATE: - //TODO:can there be good smart types? - //(how about incomplete String templates?) - return null; } lastTree = tree; path = path.getParentPath(); diff --git a/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/StringTemplates.java b/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/StringTemplates.java deleted file mode 100644 index d59ec8394e5a..000000000000 --- a/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/StringTemplates.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 test; - -public class StringTemplates { - public String get1(String str, Integer i) { - return STR. - } - public String get2(String str, Integer i) { - return STR."\{}"; - } - public String get3(String str, Integer i) { - return STR.""" - \{}"""; - } -} diff --git a/java/java.completion/test/unit/src/org/netbeans/modules/java/completion/StringTemplatesTest.java b/java/java.completion/test/unit/src/org/netbeans/modules/java/completion/StringTemplatesTest.java deleted file mode 100644 index b6c74e9fdb5b..000000000000 --- a/java/java.completion/test/unit/src/org/netbeans/modules/java/completion/StringTemplatesTest.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * 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.completion; - -import java.util.ArrayList; -import java.util.List; -import javax.lang.model.SourceVersion; -import javax.swing.event.ChangeListener; -import org.netbeans.modules.java.source.parsing.JavacParser; -import org.netbeans.spi.java.queries.CompilerOptionsQueryImplementation; -import org.openide.filesystems.FileObject; -import org.openide.util.lookup.ServiceProvider; - -public class StringTemplatesTest extends CompletionTestBase { - - public StringTemplatesTest(String testName) { - super(testName); - } - - public void testStringTemplates1() throws Exception { - TestCompilerOptionsQueryImplementation.EXTRA_OPTIONS.add("--enable-preview"); - performTest("StringTemplates", 922, "\"\\{str.", "stringContent.pass", getLatestSource()); - } - - public void testStringTemplates2() throws Exception { - TestCompilerOptionsQueryImplementation.EXTRA_OPTIONS.add("--enable-preview"); - performTest("StringTemplates", 999, "str.", "stringContent.pass", getLatestSource()); - } - - public void testStringTemplates3() throws Exception { - TestCompilerOptionsQueryImplementation.EXTRA_OPTIONS.add("--enable-preview"); - performTest("StringTemplates", 922, "\"\\{\"\\{str.", "stringContent.pass", getLatestSource()); - } - - public void testStringTemplates4() throws Exception { - TestCompilerOptionsQueryImplementation.EXTRA_OPTIONS.add("--enable-preview"); - performTest("StringTemplates", 922, "\"\\{", "templateStart.pass", getLatestSource()); - } - - public void testStringTemplatesBlock1() throws Exception { - TestCompilerOptionsQueryImplementation.EXTRA_OPTIONS.add("--enable-preview"); - performTest("StringTemplates", 922, "\"\"\"\n\\{str.", "stringContent.pass", getLatestSource()); - } - - public void testStringTemplatesBlock2() throws Exception { - TestCompilerOptionsQueryImplementation.EXTRA_OPTIONS.add("--enable-preview"); - performTest("StringTemplates", 1101, "str.", "stringContent.pass", getLatestSource()); - } - - private String getLatestSource() { - return SourceVersion.latest().name().substring(SourceVersion.latest().name().indexOf("_") + 1); - } - - static { - JavacParser.DISABLE_SOURCE_LEVEL_DOWNGRADE = true; - } - - @ServiceProvider(service = CompilerOptionsQueryImplementation.class, position = 100) - public static class TestCompilerOptionsQueryImplementation implements CompilerOptionsQueryImplementation { - - private static final List EXTRA_OPTIONS = new ArrayList<>(); - - @Override - public CompilerOptionsQueryImplementation.Result getOptions(FileObject file) { - return new CompilerOptionsQueryImplementation.Result() { - @Override - public List getArguments() { - return EXTRA_OPTIONS; - } - - @Override - public void addChangeListener(ChangeListener listener) { - } - - @Override - public void removeChangeListener(ChangeListener listener) { - } - }; - } - } -} diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/Imports.java b/java/java.hints/src/org/netbeans/modules/java/hints/Imports.java index 8946acf5292b..f0723c11ca7b 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/Imports.java +++ b/java/java.hints/src/org/netbeans/modules/java/hints/Imports.java @@ -161,14 +161,8 @@ private static List getAllImportsOfKind(CompilationInfo ci, Impo if (it.getQualifiedIdentifier() instanceof MemberSelectTree) { MemberSelectTree ms = (MemberSelectTree) it.getQualifiedIdentifier(); if (kind == ImportHintKind.DEFAULT_PACKAGE) { - if (it.isStatic()) { - if (ms.getExpression().toString().equals("java.lang.StringTemplate") && ms.getIdentifier().toString().equals("STR")) { - result.add(TreePathHandle.create(new TreePath(topLevel, it), ci)); - } - } else { - if ((ms.getExpression().toString().equals(DEFAULT_PACKAGE))) { - result.add(TreePathHandle.create(new TreePath(topLevel, it), ci)); - } + if (!it.isStatic() && ms.getExpression().toString().equals(DEFAULT_PACKAGE)) { + result.add(TreePathHandle.create(new TreePath(topLevel, it), ci)); } } if (it.isStatic()) { diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/suggestions/ExpectedTypeResolver.java b/java/java.hints/src/org/netbeans/modules/java/hints/suggestions/ExpectedTypeResolver.java index a6ab78059b6d..b266c3944ae8 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/suggestions/ExpectedTypeResolver.java +++ b/java/java.hints/src/org/netbeans/modules/java/hints/suggestions/ExpectedTypeResolver.java @@ -73,7 +73,6 @@ import com.sun.source.tree.RequiresTree; import com.sun.source.tree.ReturnTree; import com.sun.source.tree.Scope; -import com.sun.source.tree.StringTemplateTree; import com.sun.source.tree.SwitchExpressionTree; import com.sun.source.tree.SwitchTree; import com.sun.source.tree.SynchronizedTree; @@ -1432,12 +1431,6 @@ public List visitDeconstructionPattern(DeconstructionPatte return null; } - @Override - public List visitStringTemplate(StringTemplateTree stt, Object p) { - //TODO: - return null; - } - @Override public List visitAnyPattern(AnyPatternTree apt, Object p) { return null; diff --git a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/ImportsTest.java b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/ImportsTest.java index 1cd70f8478eb..aded17510c7c 100644 --- a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/ImportsTest.java +++ b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/ImportsTest.java @@ -18,12 +18,9 @@ */ package org.netbeans.modules.java.hints; -import javax.lang.model.SourceVersion; import org.netbeans.junit.NbTestCase; import org.netbeans.modules.java.hints.test.api.HintTest; -import static org.junit.Assume.assumeTrue; - /** * * @author lahvac @@ -61,33 +58,26 @@ public void testUnusedSimpleRemove() throws Exception { } public void testRedundantLangImportRemove() throws Exception { - assumeTrue(Runtime.version().feature() >= 21); // API dependency HintTest.create() - .sourceLevel(SourceVersion.latest().ordinal()) - .options("--enable-preview") .input( "package test;\n" + + "import java.lang.Exception;\n" + "import java.lang.System;\n" + - "import static java.lang.StringTemplate.STR;\n" + - "import static java.lang.StringTemplate.RAW;\n" + "public class Test {\n" + - " public static void main(String[] args) {\n" + - " System.out.println(STR.\"hello world\");\n" + - " System.out.println(RAW.\"hello world\");" + + " public static void main(String[] args) throws Exception {\n" + + " System.out.println(\"hello world\");\n" + " }\n" + "}") .run(Imports.class) - .assertWarnings("1:0-1:24:verifier:DN_Imports_DEFAULT_PACKAGE", "2:0-2:43:verifier:DN_Imports_DEFAULT_PACKAGE") - .findWarning("1:0-1:24:verifier:DN_Imports_DEFAULT_PACKAGE") + .assertWarnings("1:0-1:27:verifier:DN_Imports_DEFAULT_PACKAGE", "2:0-2:24:verifier:DN_Imports_DEFAULT_PACKAGE") + .findWarning("2:0-2:24:verifier:DN_Imports_DEFAULT_PACKAGE") .applyFix("LBL_Imports_Fix_All_DEFAULT_PACKAGE") .assertCompilable() .assertOutput( "package test;\n" + - "import static java.lang.StringTemplate.RAW;\n" + "public class Test {\n" + - " public static void main(String[] args) {\n" + - " System.out.println(STR.\"hello world\");\n" + - " System.out.println(RAW.\"hello world\");" + + " public static void main(String[] args) throws Exception {\n" + + " System.out.println(\"hello world\");\n" + " }\n" + "}"); } diff --git a/java/java.source.base/nbproject/org-netbeans-modules-java-source-base.sig b/java/java.source.base/nbproject/org-netbeans-modules-java-source-base.sig index 1fd2a7b2cdfe..125e97a224a5 100644 --- a/java/java.source.base/nbproject/org-netbeans-modules-java-source-base.sig +++ b/java/java.source.base/nbproject/org-netbeans-modules-java-source-base.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 2.66.0 +#Version 2.68.0 CLSS public abstract interface com.sun.source.tree.TreeVisitor<%0 extends java.lang.Object, %1 extends java.lang.Object> meth public abstract {com.sun.source.tree.TreeVisitor%0} visitAnnotatedType(com.sun.source.tree.AnnotatedTypeTree,{com.sun.source.tree.TreeVisitor%1}) @@ -56,7 +56,6 @@ meth public abstract {com.sun.source.tree.TreeVisitor%0} visitPrimitiveType(com. meth public abstract {com.sun.source.tree.TreeVisitor%0} visitProvides(com.sun.source.tree.ProvidesTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitRequires(com.sun.source.tree.RequiresTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitReturn(com.sun.source.tree.ReturnTree,{com.sun.source.tree.TreeVisitor%1}) -meth public abstract {com.sun.source.tree.TreeVisitor%0} visitStringTemplate(com.sun.source.tree.StringTemplateTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSwitch(com.sun.source.tree.SwitchTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSwitchExpression(com.sun.source.tree.SwitchExpressionTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSynchronized(com.sun.source.tree.SynchronizedTree,{com.sun.source.tree.TreeVisitor%1}) @@ -140,7 +139,6 @@ meth public {com.sun.source.util.TreeScanner%0} visitPrimitiveType(com.sun.sourc meth public {com.sun.source.util.TreeScanner%0} visitProvides(com.sun.source.tree.ProvidesTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitRequires(com.sun.source.tree.RequiresTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitReturn(com.sun.source.tree.ReturnTree,{com.sun.source.util.TreeScanner%1}) -meth public {com.sun.source.util.TreeScanner%0} visitStringTemplate(com.sun.source.tree.StringTemplateTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSwitch(com.sun.source.tree.SwitchTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSwitchExpression(com.sun.source.tree.SwitchExpressionTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSynchronized(com.sun.source.tree.SynchronizedTree,{com.sun.source.util.TreeScanner%1}) @@ -1506,7 +1504,6 @@ meth public com.sun.source.tree.PrimitiveTypeTree PrimitiveType(javax.lang.model meth public com.sun.source.tree.ProvidesTree Provides(com.sun.source.tree.ExpressionTree,java.util.List) meth public com.sun.source.tree.RequiresTree Requires(boolean,boolean,com.sun.source.tree.ExpressionTree) meth public com.sun.source.tree.ReturnTree Return(com.sun.source.tree.ExpressionTree) -meth public com.sun.source.tree.StringTemplateTree StringTemplate(com.sun.source.tree.ExpressionTree,java.util.List,java.util.List) meth public com.sun.source.tree.SwitchTree Switch(com.sun.source.tree.ExpressionTree,java.util.List) meth public com.sun.source.tree.SwitchTree addSwitchCase(com.sun.source.tree.SwitchTree,com.sun.source.tree.CaseTree) meth public com.sun.source.tree.SwitchTree insertSwitchCase(com.sun.source.tree.SwitchTree,int,com.sun.source.tree.CaseTree) diff --git a/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java b/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java index 8eeca5480203..6b8b05e16e79 100644 --- a/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java +++ b/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java @@ -3917,16 +3917,4 @@ public LambdaExpressionTree setLambdaBody(LambdaExpressionTree method, Tree newB return delegate.setLambdaBody(method, newBody); } - /**Creates a new string template expression from the given parameters. - * - * @param processor the processor of the string template - * @param fragments the template fragments - * @param expressions the template expressions - * @return the string template instance - * @since 2.65 - */ - public StringTemplateTree StringTemplate(ExpressionTree processor, List fragments, List expressions) { - return delegate.StringTemplate(processor, fragments, expressions); - } - } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java b/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java index dded462b5ee8..836872d20f01 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java @@ -34,7 +34,7 @@ */ public class NoJavacHelper { - public static final int REQUIRED_JAVAC_VERSION = 22; // <- TODO: increment on every release + public static final int REQUIRED_JAVAC_VERSION = 23; // <- TODO: increment on every release private static final boolean HAS_WORKING_JAVAC; static { diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/builder/TreeFactory.java b/java/java.source.base/src/org/netbeans/modules/java/source/builder/TreeFactory.java index e31b4697659d..aed7625d6e78 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/builder/TreeFactory.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/builder/TreeFactory.java @@ -222,12 +222,6 @@ public PatternCaseLabelTree PatternCaseLabel(PatternTree pat) { return make.at(NOPOS).PatternCaseLabel((JCPattern) pat); } - public StringTemplateTree StringTemplate(ExpressionTree processor, List fragments, List expressions) { - return make.at(NOPOS).StringTemplate((JCExpression) processor, - fragments.stream().collect(com.sun.tools.javac.util.List.collector()), - expressions.stream().map(expr -> (JCExpression) expr).collect(com.sun.tools.javac.util.List.collector())); - } - public AnyPatternTree AnyPattern() { return make.at(NOPOS).AnyPattern(); } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java b/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java index 0075fbc04b07..2faea15be640 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java @@ -116,7 +116,6 @@ import org.netbeans.modules.java.source.parsing.FileObjects; import org.netbeans.modules.java.source.parsing.JavacParser; import org.netbeans.modules.java.source.save.CasualDiff; -import org.netbeans.modules.java.source.save.CasualDiff.StringTemplateFragmentTree; import org.netbeans.modules.java.source.save.DiffContext; import org.netbeans.modules.java.source.save.PositionEstimator; import org.netbeans.modules.java.source.save.Reformatter; @@ -1895,27 +1894,14 @@ public void visitLiteral(JCLiteral tree) { case CHAR: print("\'" + quote( - String.valueOf((char) ((Number) tree.value).intValue()), '"') + + String.valueOf((char) ((Number) tree.value).intValue()), '"', true) + "\'"); break; case CLASS: if (tree.value instanceof String) { - String leading; - String trailing; - if (tree instanceof StringTemplateFragmentTree) { - StringTemplateFragmentTree stf = (StringTemplateFragmentTree) tree; - switch (stf.fragmentKind) { - case START: leading = "\""; trailing = "\\{"; break; - case MIDDLE: leading = "}"; trailing = "\\{"; break; - case END: leading = "}"; trailing = "\""; break; - default: throw new IllegalStateException(stf.fragmentKind.name()); - } - } else { - leading = trailing = "\""; - } - print(leading); - print(quote((String) tree.value, '\'')); - print(trailing); + print("\""); + print(quote((String) tree.value, '\'', false)); + print("\""); } else if (tree.value instanceof String[]) { int indent = out.col; print("\"\"\""); @@ -1929,7 +1915,7 @@ public void visitLiteral(JCLiteral tree) { print('\\'); print('"'); } else if (line.charAt(c) != '\'' && line.charAt(c) != '"') { - print(Convert.quote(line.charAt(c))); + print(Convert.quote(line.charAt(c), false)); } else { print(line.charAt(c)); } @@ -1954,12 +1940,12 @@ public void visitLiteral(JCLiteral tree) { } } - private static String quote(String val, char keep) { + private static String quote(String val, char keep, boolean charContext) { StringBuilder sb = new StringBuilder(); for (int i = 0; i < val.length(); i++) { char c = val.charAt(i); if (c != keep) { - sb.append(Convert.quote(c)); + sb.append(Convert.quote(c, charContext)); } else { sb.append(c); } @@ -2092,31 +2078,6 @@ public void visitConstantCaseLabel(JCConstantCaseLabel tree) { printExpr(tree.expr); } - @Override - public void visitStringTemplate(JCStringTemplate tree) { - printExpr(tree.processor, TreeInfo.postfixPrec); - print('.'); - - Iterator fragmentIt = tree.fragments.iterator(); - Iterator expressionIt = tree.expressions.iterator(); - boolean start = true; - - while (expressionIt.hasNext()) { - if (start) { - print("\""); - } else { - print("}"); - } - print(quote(fragmentIt.next(), '\'')); - print("\\{"); - print(expressionIt.next()); - start = false; - } - print("}"); - print(quote(fragmentIt.next(), '\'')); - print("\""); - } - @Override public void visitLetExpr(LetExpr tree) { print("(let " + tree.defs + " in " + tree.expr + ")"); diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java index 93ca03a57e8d..08527547a62a 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java @@ -109,7 +109,6 @@ import com.sun.tools.javac.tree.JCTree.JCRequires; import com.sun.tools.javac.tree.JCTree.JCReturn; import com.sun.tools.javac.tree.JCTree.JCStatement; -import com.sun.tools.javac.tree.JCTree.JCStringTemplate; import com.sun.tools.javac.tree.JCTree.JCSwitch; import com.sun.tools.javac.tree.JCTree.JCSwitchExpression; import com.sun.tools.javac.tree.JCTree.JCSynchronized; @@ -175,7 +174,6 @@ import org.openide.util.NbBundle; import org.openide.util.NbCollections; import javax.lang.model.type.TypeKind; -import org.netbeans.modules.java.source.save.CasualDiff.StringTemplateFragmentTree.FragmentKind; import org.netbeans.modules.java.source.transform.TreeHelpers; public class CasualDiff { @@ -1992,61 +1990,6 @@ protected int diffRecordPattern(JCRecordPattern oldT, JCRecordPattern newT, int[ return bounds[1]; } - protected int diffStringTemplate(JCStringTemplate oldT, JCStringTemplate newT, int[] bounds) { - int localPointer = bounds[0]; - - // processor - int[] processorBounds = getBounds(oldT.processor); - copyTo(localPointer, processorBounds[0]); - localPointer = diffTree(oldT.processor, newT.processor, processorBounds); - - tokenSequence.move(processorBounds[1]); - do { } while (tokenSequence.moveNext() && JavaTokenId.DOT != tokenSequence.token().id()); - tokenSequence.moveNext(); - copyTo(localPointer, localPointer = tokenSequence.offset()); - - // expressions - List oldFragmentsAndExpressions = zipFragmentsAndExpressions(oldT, localPointer); - List newFragmentsAndExpressions = zipFragmentsAndExpressions(newT, NOPOS); - PositionEstimator est = EstimatorFactory.stringTemplate(oldFragmentsAndExpressions, newFragmentsAndExpressions, diffContext); - localPointer = diffList(oldFragmentsAndExpressions, newFragmentsAndExpressions, localPointer, est, Measure.REAL_MEMBER, printer); - copyTo(localPointer, bounds[1]); - return bounds[1]; - } - - private List zipFragmentsAndExpressions(JCStringTemplate template, int pos) { - ListBuffer result = new ListBuffer<>(); - Iterator fragmentIt = template.fragments.iterator(); - Iterator expressionIt = template.expressions.iterator(); - - while (fragmentIt.hasNext()) { - JCExpression expression = expressionIt.hasNext() ? expressionIt.next() : null; - FragmentKind fragmentKind = result.isEmpty() ? FragmentKind.START - : expression != null ? FragmentKind.MIDDLE - : FragmentKind.END; - JCLiteral literal = new StringTemplateFragmentTree(TypeTag.CLASS, fragmentIt.next(), fragmentKind); - - if (pos != NOPOS) { - tokenSequence.move(pos); - - if (tokenSequence.moveNext() && tokenSequence.token().id() == JavaTokenId.STRING_LITERAL) { - literal.pos = tokenSequence.offset(); - diffContext.syntheticEndPositions.put(literal, literal.pos + tokenSequence.token().length()); - } - - pos = expression != null ? endPos(expression) : NOPOS; - } - - result.append(literal); - - if (expression != null) { - result.append(expression); - } - } - - return result.toList(); - } - protected int diffConstantCaseLabel(JCConstantCaseLabel oldT, JCConstantCaseLabel newT, int[] bounds) { return diffTree((JCTree) oldT.expr, (JCTree) newT.expr, bounds); } @@ -5813,9 +5756,6 @@ private int diffTreeImpl0(JCTree oldT, JCTree newT, JCTree parent /*used only fo case RECORDPATTERN: retVal = diffRecordPattern((JCRecordPattern) oldT, (JCRecordPattern) newT, elementBounds); break; - case STRING_TEMPLATE: - retVal = diffStringTemplate((JCStringTemplate) oldT, (JCStringTemplate) newT, elementBounds); - break; default: // handle special cases like field groups and enum constants if (oldT.getKind() == Kind.OTHER) { @@ -6444,19 +6384,4 @@ private int findVar(int start, int end) { return -1; } - public static final class StringTemplateFragmentTree extends JCLiteral { - - public final FragmentKind fragmentKind; - - public StringTemplateFragmentTree(TypeTag typetag, Object value, FragmentKind kind) { - super(typetag, value); - this.fragmentKind = kind; - } - - public enum FragmentKind { - START, - MIDDLE, - END; - } - } } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java index 86cb9171cf25..f1239136427f 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java @@ -3556,18 +3556,6 @@ public Boolean visitErroneous(ErroneousTree node, Void p) { return true; } - @Override - public Boolean visitStringTemplate(StringTemplateTree node, Void p) { - scan(node.getProcessor(), p); - accept(DOT); - for (ExpressionTree expression : node.getExpressions()) { - accept(STRING_LITERAL); - scan(expression, p); - } - accept(STRING_LITERAL); - return true; - } - @Override public Boolean visitOther(Tree node, Void p) { do { diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/transform/ImmutableTreeTranslator.java b/java/java.source.base/src/org/netbeans/modules/java/source/transform/ImmutableTreeTranslator.java index 7182ff73ea09..4efeb9b2af6c 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/transform/ImmutableTreeTranslator.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/transform/ImmutableTreeTranslator.java @@ -615,10 +615,6 @@ public Tree visitYield(YieldTree tree, Object p) { return rewriteChildren(tree); } @Override - public Tree visitStringTemplate(StringTemplateTree tree, Object p) { - return rewriteChildren(tree); - } - @Override public Tree visitAnyPattern(AnyPatternTree tree, Object p) { return rewriteChildren(tree); } @@ -1545,19 +1541,6 @@ private DeconstructionPatternTree rewriteChildren(DeconstructionPatternTree tree return tree; } - private StringTemplateTree rewriteChildren(StringTemplateTree tree) { - ExpressionTree newProcessor = (ExpressionTree) translate(tree.getProcessor()); - List newExpressions = translate(tree.getExpressions()); - if (newProcessor != tree.getProcessor()|| !Objects.equals(newExpressions, tree.getExpressions())) { - StringTemplateTree n = make.StringTemplate(newProcessor, tree.getFragments(), newExpressions); - model.setType(n, model.getType(tree)); - copyCommentTo(tree,n); - copyPosTo(tree,n); - tree = n; - } - return tree; - } - private AnyPatternTree rewriteChildren(AnyPatternTree tree) { return tree; } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/transform/TreeDuplicator.java b/java/java.source.base/src/org/netbeans/modules/java/source/transform/TreeDuplicator.java index 0a66c94932a1..c09091ec46d1 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/transform/TreeDuplicator.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/transform/TreeDuplicator.java @@ -72,7 +72,6 @@ import com.sun.source.tree.ProvidesTree; import com.sun.source.tree.RequiresTree; import com.sun.source.tree.ReturnTree; -import com.sun.source.tree.StringTemplateTree; import com.sun.source.tree.SwitchExpressionTree; import com.sun.source.tree.SwitchTree; import com.sun.source.tree.SynchronizedTree; @@ -714,15 +713,6 @@ public Tree visitAnyPattern(AnyPatternTree tree, Void p) { return make.AnyPattern(); } - @Override - public Tree visitStringTemplate(StringTemplateTree tree, Void p) { - StringTemplateTree n = make.StringTemplate(tree.getProcessor(), tree.getFragments(), tree.getExpressions()); - model.setType(n, model.getType(tree)); - comments.copyComments(tree, n); - model.setPos(n, model.getPos(tree)); - return n; - } - @Override public Tree visitSwitchExpression(SwitchExpressionTree tree, Void p) { SwitchExpressionTree n = make.SwitchExpression(tree.getExpression(), tree.getCases()); diff --git a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/StringTemplateTest.java b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/StringTemplateTest.java deleted file mode 100644 index df7b4cfca365..000000000000 --- a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/StringTemplateTest.java +++ /dev/null @@ -1,349 +0,0 @@ -/* - * 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.api.java.source.gen; - -import com.sun.source.tree.BlockTree; -import com.sun.source.tree.CaseTree; -import com.sun.source.tree.ClassTree; -import com.sun.source.tree.CompilationUnitTree; -import com.sun.source.tree.ExpressionTree; -import com.sun.source.tree.IdentifierTree; -import com.sun.source.tree.MethodTree; -import com.sun.source.tree.NewClassTree; -import com.sun.source.tree.StatementTree; -import com.sun.source.tree.StringTemplateTree; -import com.sun.source.tree.SwitchExpressionTree; -import com.sun.source.tree.SwitchTree; -import com.sun.source.tree.Tree; -import com.sun.source.tree.Tree.Kind; -import com.sun.source.tree.VariableTree; -import com.sun.source.util.TreeScanner; -import com.sun.tools.javac.tree.JCTree; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.EnumSet; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.Element; -import javax.lang.model.element.Modifier; -import javax.swing.event.ChangeListener; -import static junit.framework.TestCase.assertEquals; -import static junit.framework.TestCase.assertNotNull; -import org.netbeans.api.java.source.JavaSource; -import org.netbeans.api.java.source.Task; -import org.netbeans.api.java.source.TestUtilities; -import org.netbeans.api.java.source.TreeMaker; -import org.netbeans.api.java.source.WorkingCopy; -import org.netbeans.junit.NbTestSuite; -import org.netbeans.modules.java.source.parsing.JavacParser; -import org.netbeans.spi.java.queries.CompilerOptionsQueryImplementation; -import org.openide.filesystems.FileObject; -import org.openide.util.lookup.ServiceProvider; - -public class StringTemplateTest extends TreeRewriteTestBase { - - private static final List EXTRA_OPTIONS = new ArrayList<>(); - - public StringTemplateTest(String testName) { - super(testName); - } - - public static NbTestSuite suite() { - NbTestSuite suite = new NbTestSuite(); - suite.addTestSuite(StringTemplateTest.class); - return suite; - } - - @Override - protected void setUp() throws Exception { - super.setUp(); - sourceLevel = "1.21"; - JavacParser.DISABLE_SOURCE_LEVEL_DOWNGRADE = true; - EXTRA_OPTIONS.add("--enable-preview"); - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - JavacParser.DISABLE_SOURCE_LEVEL_DOWNGRADE = false; - - } - - @ServiceProvider(service = CompilerOptionsQueryImplementation.class, position = 100) - public static class TestCompilerOptionsQueryImplementation implements CompilerOptionsQueryImplementation { - - @Override - public CompilerOptionsQueryImplementation.Result getOptions(FileObject file) { - return new CompilerOptionsQueryImplementation.Result() { - @Override - public List getArguments() { - return EXTRA_OPTIONS; - } - - @Override - public void addChangeListener(ChangeListener listener) { - } - - @Override - public void removeChangeListener(ChangeListener listener) { - } - }; - } - - } - - public void testRenameInStringTemplate() throws Exception { - String code = "package test; \n" - + "public class Test {\n" - + " private String test(int a, int b) {\n" - + " return STR.\"\\{a}\";\n" - + " }\n" - + "}\n"; - String golden = "package test; \n" - + "public class Test {\n" - + " private String test(int a, int b) {\n" - + " return FMT.\"\\{b}\";\n" - + " }\n" - + "}\n"; - - prepareTest("Test", code); - - JavaSource js = getJavaSource(); - assertNotNull(js); - - Task task = new Task() { - public void run(WorkingCopy workingCopy) throws IOException { - workingCopy.toPhase(JavaSource.Phase.RESOLVED); - TreeMaker make = workingCopy.getTreeMaker(); - CompilationUnitTree cut = workingCopy.getCompilationUnit(); - new TreeScanner() { - @Override - public Void visitIdentifier(IdentifierTree node, Void p) { - if (node.getName().contentEquals("a")) { - workingCopy.rewrite(node, make.Identifier("b")); - return null; - } - if (node.getName().contentEquals("STR")) { - workingCopy.rewrite(node, make.Identifier("FMT")); - return null; - } - return super.visitIdentifier(node, p); - } - }.scan(cut, null); - } - - }; - - js.runModificationTask(task).commit(); - - String res = TestUtilities.copyFileToString(getTestFile()); - //System.err.println(res); - assertEquals(golden, res); - - } - - public void testRemoveStringTemplateFragment() throws Exception { - String code = "package test; \n" - + "public class Test {\n" - + " private String test(int a, int b, int c) {\n" - + " String s1 = STR.\"a\\{a}b\\{b}c\\{c}e\";\n" - + " String s2 = STR.\"a\\{a}b\\{b}c\\{c}e\";\n" - + " String s3 = STR.\"a\\{a}b\\{b}c\\{c}e\";\n" - + " }\n" - + "}\n"; - String golden = "package test; \n" - + "public class Test {\n" - + " private String test(int a, int b, int c) {\n" - + " String s1 = STR.\"b\\{b}c\\{c}e\";\n" - + " String s2 = STR.\"a\\{a}c\\{c}e\";\n" - + " String s3 = STR.\"a\\{a}b\\{b}e\";\n" - + " }\n" - + "}\n"; - - prepareTest("Test", code); - - JavaSource js = getJavaSource(); - assertNotNull(js); - - Task task = new Task() { - public void run(WorkingCopy workingCopy) throws IOException { - workingCopy.toPhase(JavaSource.Phase.RESOLVED); - TreeMaker make = workingCopy.getTreeMaker(); - CompilationUnitTree cut = workingCopy.getCompilationUnit(); - new TreeScanner() { - @Override - public Void visitVariable(VariableTree node, Void p) { - CONT: if (node.getInitializer() != null) { - int toDelete; - switch (node.getName().toString()) { - case "s1": toDelete = 0; break; - case "s2": toDelete = 1; break; - case "s3": toDelete = 2; break; - default: break CONT; - } - - StringTemplateTree template = (StringTemplateTree) node.getInitializer(); - List fragments = new ArrayList<>(template.getFragments()); - List expressions = new ArrayList<>(template.getExpressions()); - - fragments.remove(toDelete); - expressions.remove(toDelete); - - workingCopy.rewrite(template, make.StringTemplate(template.getProcessor(), fragments, expressions)); - } - return super.visitVariable(node, p); - } - }.scan(cut, null); - } - - }; - - js.runModificationTask(task).commit(); - - String res = TestUtilities.copyFileToString(getTestFile()); - //System.err.println(res); - assertEquals(golden, res); - - } - - public void testAddStringTemplateFragment() throws Exception { - String code = "package test; \n" - + "public class Test {\n" - + " private String test(int a, int b, int c) {\n" - + " String s1 = STR.\"0\\{0}1\\{1}e\";\n" - + " String s2 = STR.\"0\\{0}1\\{1}e\";\n" - + " String s3 = STR.\"0\\{0}1\\{1}e\";\n" - + " }\n" - + "}\n"; - String golden = "package test; \n" - + "public class Test {\n" - + " private String test(int a, int b, int c) {\n" - + " String s1 = STR.\"a\\{a}0\\{0}1\\{1}e\";\n" - + " String s2 = STR.\"0\\{0}a\\{a}1\\{1}e\";\n" - + " String s3 = STR.\"0\\{0}1\\{1}a\\{a}e\";\n" - + " }\n" - + "}\n"; - - prepareTest("Test", code); - - JavaSource js = getJavaSource(); - assertNotNull(js); - - Task task = new Task() { - public void run(WorkingCopy workingCopy) throws IOException { - workingCopy.toPhase(JavaSource.Phase.RESOLVED); - TreeMaker make = workingCopy.getTreeMaker(); - CompilationUnitTree cut = workingCopy.getCompilationUnit(); - new TreeScanner() { - @Override - public Void visitVariable(VariableTree node, Void p) { - CONT: if (node.getInitializer() != null) { - int insertPos; - switch (node.getName().toString()) { - case "s1": insertPos = 0; break; - case "s2": insertPos = 1; break; - case "s3": insertPos = 2; break; - default: break CONT; - } - - StringTemplateTree template = (StringTemplateTree) node.getInitializer(); - List fragments = new ArrayList<>(template.getFragments()); - List expressions = new ArrayList<>(template.getExpressions()); - - fragments.add(insertPos, "a"); - expressions.add(insertPos, make.Identifier("a")); - - workingCopy.rewrite(template, make.StringTemplate(template.getProcessor(), fragments, expressions)); - } - return super.visitVariable(node, p); - } - }.scan(cut, null); - } - - }; - - js.runModificationTask(task).commit(); - - String res = TestUtilities.copyFileToString(getTestFile()); - //System.err.println(res); - assertEquals(golden, res); - - } - - public void testNewStringTemplate() throws Exception { - String code = "package test; \n" - + "public class Test {\n" - + " private String test(int a, int b, int c) {\n" - + " String s;\n" - + " }\n" - + "}\n"; - String golden = "package test; \n" - + "public class Test {\n" - + " private String test(int a, int b, int c) {\n" - + " String s = STR.\"a\\{a}b\\{b}c\\{c}e\";\n" - + " }\n" - + "}\n"; - - prepareTest("Test", code); - - JavaSource js = getJavaSource(); - assertNotNull(js); - - Task task = new Task() { - public void run(WorkingCopy workingCopy) throws IOException { - workingCopy.toPhase(JavaSource.Phase.RESOLVED); - TreeMaker make = workingCopy.getTreeMaker(); - CompilationUnitTree cut = workingCopy.getCompilationUnit(); - new TreeScanner() { - @Override - public Void visitVariable(VariableTree node, Void p) { - if (node.getName().contentEquals("s")) { - List fragments = new ArrayList<>(); - List expressions = new ArrayList<>(); - - fragments.add("a"); - expressions.add(make.Identifier("a")); - fragments.add("b"); - expressions.add(make.Identifier("b")); - fragments.add("c"); - expressions.add(make.Identifier("c")); - fragments.add("e"); - - workingCopy.rewrite(node, make.setInitialValue(node, make.StringTemplate(make.Identifier("STR"), fragments, expressions))); - } - return super.visitVariable(node, p); - } - }.scan(cut, null); - } - - }; - - js.runModificationTask(task).commit(); - - String res = TestUtilities.copyFileToString(getTestFile()); - //System.err.println(res); - assertEquals(golden, res); - - } - -} diff --git a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java index fc0911df9abf..c11be84ffc76 100644 --- a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java +++ b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java @@ -6753,32 +6753,6 @@ public void testSealed3() throws Exception { reformat(doc, content, golden); } - public void testStringTemplate() throws Exception { - testFile = new File(getWorkDir(), "Test.java"); - TestUtilities.copyStringToFile(testFile, ""); - FileObject testSourceFO = FileUtil.toFileObject(testFile); - DataObject testSourceDO = DataObject.find(testSourceFO); - EditorCookie ec = (EditorCookie) testSourceDO.getCookie(EditorCookie.class); - final Document doc = ec.openDocument(); - doc.putProperty(Language.class, JavaTokenId.language()); - String content - = "\n" - + "class Test {\n\n" - + " private String t() {\n" - + " return STR.\"a\\{1 + 2}b\";\n" - + " }\n" - + "}\n"; - - String golden - = "\n" - + "class Test {\n\n" - + " private String t() {\n" - + " return STR.\"a\\{1 + 2}b\";\n" - + " }\n" - + "}\n"; - reformat(doc, content, golden); - } - private void reformat(Document doc, String content, String golden) throws Exception { reformat(doc, content, golden, 0, content.length()); } diff --git a/java/java.source/nbproject/org-netbeans-modules-java-source.sig b/java/java.source/nbproject/org-netbeans-modules-java-source.sig index a3b5dcc5461c..5b74ba762b92 100644 --- a/java/java.source/nbproject/org-netbeans-modules-java-source.sig +++ b/java/java.source/nbproject/org-netbeans-modules-java-source.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 0.189.0 +#Version 0.190.0 CLSS public abstract interface com.sun.source.tree.TreeVisitor<%0 extends java.lang.Object, %1 extends java.lang.Object> meth public abstract {com.sun.source.tree.TreeVisitor%0} visitAnnotatedType(com.sun.source.tree.AnnotatedTypeTree,{com.sun.source.tree.TreeVisitor%1}) @@ -56,7 +56,6 @@ meth public abstract {com.sun.source.tree.TreeVisitor%0} visitPrimitiveType(com. meth public abstract {com.sun.source.tree.TreeVisitor%0} visitProvides(com.sun.source.tree.ProvidesTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitRequires(com.sun.source.tree.RequiresTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitReturn(com.sun.source.tree.ReturnTree,{com.sun.source.tree.TreeVisitor%1}) -meth public abstract {com.sun.source.tree.TreeVisitor%0} visitStringTemplate(com.sun.source.tree.StringTemplateTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSwitch(com.sun.source.tree.SwitchTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSwitchExpression(com.sun.source.tree.SwitchExpressionTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSynchronized(com.sun.source.tree.SynchronizedTree,{com.sun.source.tree.TreeVisitor%1}) @@ -140,7 +139,6 @@ meth public {com.sun.source.util.TreeScanner%0} visitPrimitiveType(com.sun.sourc meth public {com.sun.source.util.TreeScanner%0} visitProvides(com.sun.source.tree.ProvidesTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitRequires(com.sun.source.tree.RequiresTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitReturn(com.sun.source.tree.ReturnTree,{com.sun.source.util.TreeScanner%1}) -meth public {com.sun.source.util.TreeScanner%0} visitStringTemplate(com.sun.source.tree.StringTemplateTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSwitch(com.sun.source.tree.SwitchTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSwitchExpression(com.sun.source.tree.SwitchExpressionTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSynchronized(com.sun.source.tree.SynchronizedTree,{com.sun.source.util.TreeScanner%1}) @@ -1511,7 +1509,6 @@ meth public com.sun.source.tree.PrimitiveTypeTree PrimitiveType(javax.lang.model meth public com.sun.source.tree.ProvidesTree Provides(com.sun.source.tree.ExpressionTree,java.util.List) meth public com.sun.source.tree.RequiresTree Requires(boolean,boolean,com.sun.source.tree.ExpressionTree) meth public com.sun.source.tree.ReturnTree Return(com.sun.source.tree.ExpressionTree) -meth public com.sun.source.tree.StringTemplateTree StringTemplate(com.sun.source.tree.ExpressionTree,java.util.List,java.util.List) meth public com.sun.source.tree.SwitchTree Switch(com.sun.source.tree.ExpressionTree,java.util.List) meth public com.sun.source.tree.SwitchTree addSwitchCase(com.sun.source.tree.SwitchTree,com.sun.source.tree.CaseTree) meth public com.sun.source.tree.SwitchTree insertSwitchCase(com.sun.source.tree.SwitchTree,int,com.sun.source.tree.CaseTree) diff --git a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBAttr.java b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBAttr.java index 0935891ddf5c..beb38b2aaa33 100644 --- a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBAttr.java +++ b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBAttr.java @@ -29,7 +29,6 @@ import com.sun.tools.javac.tree.JCTree.JCClassDecl; import com.sun.tools.javac.tree.JCTree.JCExpression; import com.sun.tools.javac.tree.JCTree.JCMethodDecl; -import com.sun.tools.javac.tree.JCTree.JCStringTemplate; import com.sun.tools.javac.tree.JCTree.JCVariableDecl; import com.sun.tools.javac.tree.TreeMaker; import com.sun.tools.javac.util.Context; @@ -111,24 +110,6 @@ public void visitCatch(JCCatch that) { super.visitBlock(tm.Block(0, List.of(that.param, that.body))); } - @Override - public void visitStringTemplate(JCStringTemplate tree) { - //workaround for: - //a) crash when tree.processor is null - //b) crash when the StringTemplate.process method does not exist - //should be removed when javac is improved to be more resilient w.r.t. these errors: - boolean prevInStringTemplate = rs.inStringTemplate; - try { - if (tree.processor == null) { - tree.processor = tm.Erroneous(); - } - rs.inStringTemplate = true; - super.visitStringTemplate(tree); - } finally { - rs.inStringTemplate = prevInStringTemplate; - } - } - private boolean fullyAttribute; private Env fullyAttributeResult; diff --git a/java/libs.javacapi/external/binaries-list b/java/libs.javacapi/external/binaries-list index bf8129d49f78..bac517586c21 100644 --- a/java/libs.javacapi/external/binaries-list +++ b/java/libs.javacapi/external/binaries-list @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -07266A99C001F11616B36F5128EB78D2242F3096 com.dukescript.nbjavac:nb-javac:jdk-22.0.1+8:api -D8B9FE09D677A6D589BA3C1E5AD636AF7F47AEE2 com.dukescript.nbjavac:nb-javac:jdk-22.0.1+8 +C251D126090F6362D805B1987372BF4963B3782C com.dukescript.nbjavac:nb-javac:jdk-23+30 +A9105543E5EB96B9705D338A4C42A3A89E25A19A com.dukescript.nbjavac:nb-javac:jdk-23+30:api diff --git a/java/libs.nbjavacapi/external/nb-javac-jdk-22.0.1+8-license.txt b/java/libs.javacapi/external/nb-javac-jdk-23+30-license.txt similarity index 99% rename from java/libs.nbjavacapi/external/nb-javac-jdk-22.0.1+8-license.txt rename to java/libs.javacapi/external/nb-javac-jdk-23+30-license.txt index 2fe171364534..0995f2175e2e 100644 --- a/java/libs.nbjavacapi/external/nb-javac-jdk-22.0.1+8-license.txt +++ b/java/libs.javacapi/external/nb-javac-jdk-23+30-license.txt @@ -1,10 +1,10 @@ Name: Javac Compiler Implementation Description: Javac Compiler Implementation -Version: jdk-22.0.1+8 -Files: nb-javac-jdk-22.0.1+8-api.jar nb-javac-jdk-22.0.1+8.jar +Version: 23+30 +Files: nb-javac-jdk-23+30-api.jar nb-javac-jdk-23+30.jar License: GPL-2-CP -Origin: OpenJDK (https://github.com/openjdk/jdk22u) -Source: https://github.com/openjdk/jdk22u +Origin: OpenJDK (https://github.com/openjdk/jdk) +Source: https://github.com/openjdk/jdk Type: optional,reviewed Comment: The binary has been reviewed to be under the Classpath Exception as a whole. Optional at runtime, but used by default. diff --git a/java/libs.javacapi/nbproject/org-netbeans-libs-javacapi.sig b/java/libs.javacapi/nbproject/org-netbeans-libs-javacapi.sig index 5ee0a1c62147..f3dda70e51fd 100644 --- a/java/libs.javacapi/nbproject/org-netbeans-libs-javacapi.sig +++ b/java/libs.javacapi/nbproject/org-netbeans-libs-javacapi.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 8.48.0 +#Version 8.49.0 CLSS public abstract interface com.sun.source.doctree.AttributeTree innr public final static !enum ValueKind @@ -74,6 +74,7 @@ fld public final static com.sun.source.doctree.DocTree$Kind INHERIT_DOC fld public final static com.sun.source.doctree.DocTree$Kind LINK fld public final static com.sun.source.doctree.DocTree$Kind LINK_PLAIN fld public final static com.sun.source.doctree.DocTree$Kind LITERAL +fld public final static com.sun.source.doctree.DocTree$Kind MARKDOWN fld public final static com.sun.source.doctree.DocTree$Kind OTHER fld public final static com.sun.source.doctree.DocTree$Kind PARAM fld public final static com.sun.source.doctree.DocTree$Kind PROVIDES @@ -135,6 +136,7 @@ meth public {com.sun.source.doctree.DocTreeVisitor%0} visitEscape(com.sun.source meth public {com.sun.source.doctree.DocTreeVisitor%0} visitHidden(com.sun.source.doctree.HiddenTree,{com.sun.source.doctree.DocTreeVisitor%1}) meth public {com.sun.source.doctree.DocTreeVisitor%0} visitIndex(com.sun.source.doctree.IndexTree,{com.sun.source.doctree.DocTreeVisitor%1}) meth public {com.sun.source.doctree.DocTreeVisitor%0} visitProvides(com.sun.source.doctree.ProvidesTree,{com.sun.source.doctree.DocTreeVisitor%1}) +meth public {com.sun.source.doctree.DocTreeVisitor%0} visitRawText(com.sun.source.doctree.RawTextTree,{com.sun.source.doctree.DocTreeVisitor%1}) meth public {com.sun.source.doctree.DocTreeVisitor%0} visitSnippet(com.sun.source.doctree.SnippetTree,{com.sun.source.doctree.DocTreeVisitor%1}) meth public {com.sun.source.doctree.DocTreeVisitor%0} visitSpec(com.sun.source.doctree.SpecTree,{com.sun.source.doctree.DocTreeVisitor%1}) meth public {com.sun.source.doctree.DocTreeVisitor%0} visitSummary(com.sun.source.doctree.SummaryTree,{com.sun.source.doctree.DocTreeVisitor%1}) @@ -202,6 +204,10 @@ intf com.sun.source.doctree.BlockTagTree meth public abstract com.sun.source.doctree.ReferenceTree getServiceType() meth public abstract java.util.List getDescription() +CLSS public abstract interface com.sun.source.doctree.RawTextTree +intf com.sun.source.doctree.DocTree +meth public abstract java.lang.String getContent() + CLSS public abstract interface com.sun.source.doctree.ReferenceTree intf com.sun.source.doctree.DocTree meth public abstract java.lang.String getSignature() @@ -467,6 +473,7 @@ meth public abstract com.sun.source.tree.StatementTree getThenStatement() CLSS public abstract interface com.sun.source.tree.ImportTree intf com.sun.source.tree.Tree +meth public abstract boolean isModule() meth public abstract boolean isStatic() meth public abstract com.sun.source.tree.Tree getQualifiedIdentifier() @@ -640,12 +647,6 @@ meth public abstract javax.lang.model.element.TypeElement getEnclosingClass() CLSS public abstract interface com.sun.source.tree.StatementTree intf com.sun.source.tree.Tree -CLSS public abstract interface com.sun.source.tree.StringTemplateTree -intf com.sun.source.tree.ExpressionTree -meth public abstract com.sun.source.tree.ExpressionTree getProcessor() -meth public abstract java.util.List getExpressions() -meth public abstract java.util.List getFragments() - CLSS public abstract interface com.sun.source.tree.SwitchExpressionTree intf com.sun.source.tree.ExpressionTree meth public abstract com.sun.source.tree.ExpressionTree getExpression() @@ -772,7 +773,6 @@ fld public final static com.sun.source.tree.Tree$Kind SUPER_WILDCARD fld public final static com.sun.source.tree.Tree$Kind SWITCH fld public final static com.sun.source.tree.Tree$Kind SWITCH_EXPRESSION fld public final static com.sun.source.tree.Tree$Kind SYNCHRONIZED -fld public final static com.sun.source.tree.Tree$Kind TEMPLATE fld public final static com.sun.source.tree.Tree$Kind THROW fld public final static com.sun.source.tree.Tree$Kind TRY fld public final static com.sun.source.tree.Tree$Kind TYPE_ANNOTATION @@ -851,7 +851,6 @@ meth public abstract {com.sun.source.tree.TreeVisitor%0} visitPrimitiveType(com. meth public abstract {com.sun.source.tree.TreeVisitor%0} visitProvides(com.sun.source.tree.ProvidesTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitRequires(com.sun.source.tree.RequiresTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitReturn(com.sun.source.tree.ReturnTree,{com.sun.source.tree.TreeVisitor%1}) -meth public abstract {com.sun.source.tree.TreeVisitor%0} visitStringTemplate(com.sun.source.tree.StringTemplateTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSwitch(com.sun.source.tree.SwitchTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSwitchExpression(com.sun.source.tree.SwitchExpressionTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSynchronized(com.sun.source.tree.SynchronizedTree,{com.sun.source.tree.TreeVisitor%1}) @@ -946,6 +945,7 @@ meth public abstract com.sun.source.doctree.LiteralTree newCodeTree(com.sun.sour meth public abstract com.sun.source.doctree.LiteralTree newLiteralTree(com.sun.source.doctree.TextTree) meth public abstract com.sun.source.doctree.ParamTree newParamTree(boolean,com.sun.source.doctree.IdentifierTree,java.util.List) meth public abstract com.sun.source.doctree.ProvidesTree newProvidesTree(com.sun.source.doctree.ReferenceTree,java.util.List) +meth public abstract com.sun.source.doctree.RawTextTree newRawTextTree(com.sun.source.doctree.DocTree$Kind,java.lang.String) meth public abstract com.sun.source.doctree.ReferenceTree newReferenceTree(java.lang.String) meth public abstract com.sun.source.doctree.ReturnTree newReturnTree(java.util.List) meth public abstract com.sun.source.doctree.SeeTree newSeeTree(java.util.List) @@ -1020,6 +1020,7 @@ meth public {com.sun.source.util.DocTreeScanner%0} visitLiteral(com.sun.source.d meth public {com.sun.source.util.DocTreeScanner%0} visitOther(com.sun.source.doctree.DocTree,{com.sun.source.util.DocTreeScanner%1}) meth public {com.sun.source.util.DocTreeScanner%0} visitParam(com.sun.source.doctree.ParamTree,{com.sun.source.util.DocTreeScanner%1}) meth public {com.sun.source.util.DocTreeScanner%0} visitProvides(com.sun.source.doctree.ProvidesTree,{com.sun.source.util.DocTreeScanner%1}) +meth public {com.sun.source.util.DocTreeScanner%0} visitRawText(com.sun.source.doctree.RawTextTree,{com.sun.source.util.DocTreeScanner%1}) meth public {com.sun.source.util.DocTreeScanner%0} visitReference(com.sun.source.doctree.ReferenceTree,{com.sun.source.util.DocTreeScanner%1}) meth public {com.sun.source.util.DocTreeScanner%0} visitReturn(com.sun.source.doctree.ReturnTree,{com.sun.source.util.DocTreeScanner%1}) meth public {com.sun.source.util.DocTreeScanner%0} visitSee(com.sun.source.doctree.SeeTree,{com.sun.source.util.DocTreeScanner%1}) @@ -1055,6 +1056,7 @@ meth public abstract java.text.BreakIterator getBreakIterator() meth public abstract java.util.List getFirstSentence(java.util.List) meth public abstract javax.lang.model.element.Element getElement(com.sun.source.util.DocTreePath) meth public abstract javax.lang.model.type.TypeMirror getType(com.sun.source.util.DocTreePath) +meth public abstract javax.lang.model.util.Elements$DocCommentKind getDocCommentKind(com.sun.source.util.TreePath) meth public abstract void printMessage(javax.tools.Diagnostic$Kind,java.lang.CharSequence,com.sun.source.doctree.DocTree,com.sun.source.doctree.DocCommentTree,com.sun.source.tree.CompilationUnitTree) meth public abstract void setBreakIterator(java.text.BreakIterator) meth public static com.sun.source.util.DocTrees instance(javax.annotation.processing.ProcessingEnvironment) @@ -1113,6 +1115,7 @@ meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitLiteral(com.sun.so meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitOther(com.sun.source.doctree.DocTree,{com.sun.source.util.SimpleDocTreeVisitor%1}) meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitParam(com.sun.source.doctree.ParamTree,{com.sun.source.util.SimpleDocTreeVisitor%1}) meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitProvides(com.sun.source.doctree.ProvidesTree,{com.sun.source.util.SimpleDocTreeVisitor%1}) +meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitRawText(com.sun.source.doctree.RawTextTree,{com.sun.source.util.SimpleDocTreeVisitor%1}) meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitReference(com.sun.source.doctree.ReferenceTree,{com.sun.source.util.SimpleDocTreeVisitor%1}) meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitReturn(com.sun.source.doctree.ReturnTree,{com.sun.source.util.SimpleDocTreeVisitor%1}) meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitSee(com.sun.source.doctree.SeeTree,{com.sun.source.util.SimpleDocTreeVisitor%1}) @@ -1196,7 +1199,6 @@ meth public {com.sun.source.util.SimpleTreeVisitor%0} visitPrimitiveType(com.sun meth public {com.sun.source.util.SimpleTreeVisitor%0} visitProvides(com.sun.source.tree.ProvidesTree,{com.sun.source.util.SimpleTreeVisitor%1}) meth public {com.sun.source.util.SimpleTreeVisitor%0} visitRequires(com.sun.source.tree.RequiresTree,{com.sun.source.util.SimpleTreeVisitor%1}) meth public {com.sun.source.util.SimpleTreeVisitor%0} visitReturn(com.sun.source.tree.ReturnTree,{com.sun.source.util.SimpleTreeVisitor%1}) -meth public {com.sun.source.util.SimpleTreeVisitor%0} visitStringTemplate(com.sun.source.tree.StringTemplateTree,{com.sun.source.util.SimpleTreeVisitor%1}) meth public {com.sun.source.util.SimpleTreeVisitor%0} visitSwitch(com.sun.source.tree.SwitchTree,{com.sun.source.util.SimpleTreeVisitor%1}) meth public {com.sun.source.util.SimpleTreeVisitor%0} visitSwitchExpression(com.sun.source.tree.SwitchExpressionTree,{com.sun.source.util.SimpleTreeVisitor%1}) meth public {com.sun.source.util.SimpleTreeVisitor%0} visitSynchronized(com.sun.source.tree.SynchronizedTree,{com.sun.source.util.SimpleTreeVisitor%1}) @@ -1329,7 +1331,6 @@ meth public {com.sun.source.util.TreeScanner%0} visitPrimitiveType(com.sun.sourc meth public {com.sun.source.util.TreeScanner%0} visitProvides(com.sun.source.tree.ProvidesTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitRequires(com.sun.source.tree.RequiresTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitReturn(com.sun.source.tree.ReturnTree,{com.sun.source.util.TreeScanner%1}) -meth public {com.sun.source.util.TreeScanner%0} visitStringTemplate(com.sun.source.tree.StringTemplateTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSwitch(com.sun.source.tree.SwitchTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSwitchExpression(com.sun.source.tree.SwitchExpressionTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSynchronized(com.sun.source.tree.SynchronizedTree,{com.sun.source.util.TreeScanner%1}) @@ -1636,6 +1637,7 @@ fld public final static javax.lang.model.SourceVersion RELEASE_2 fld public final static javax.lang.model.SourceVersion RELEASE_20 fld public final static javax.lang.model.SourceVersion RELEASE_21 fld public final static javax.lang.model.SourceVersion RELEASE_22 +fld public final static javax.lang.model.SourceVersion RELEASE_23 fld public final static javax.lang.model.SourceVersion RELEASE_3 fld public final static javax.lang.model.SourceVersion RELEASE_4 fld public final static javax.lang.model.SourceVersion RELEASE_5 @@ -2081,7 +2083,7 @@ meth public abstract javax.lang.model.type.TypeMirror getExtendsBound() meth public abstract javax.lang.model.type.TypeMirror getSuperBound() CLSS public abstract javax.lang.model.util.AbstractAnnotationValueVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object> - anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_22) + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) cons protected init() supr javax.lang.model.util.AbstractAnnotationValueVisitor9<{javax.lang.model.util.AbstractAnnotationValueVisitor14%0},{javax.lang.model.util.AbstractAnnotationValueVisitor14%1}> @@ -2111,8 +2113,13 @@ CLSS public abstract javax.lang.model.util.AbstractAnnotationValueVisitor9<%0 ex cons protected init() supr javax.lang.model.util.AbstractAnnotationValueVisitor8<{javax.lang.model.util.AbstractAnnotationValueVisitor9%0},{javax.lang.model.util.AbstractAnnotationValueVisitor9%1}> +CLSS public abstract javax.lang.model.util.AbstractAnnotationValueVisitorPreview<%0 extends java.lang.Object, %1 extends java.lang.Object> + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) +cons protected init() +supr javax.lang.model.util.AbstractAnnotationValueVisitor14<{javax.lang.model.util.AbstractAnnotationValueVisitorPreview%0},{javax.lang.model.util.AbstractAnnotationValueVisitorPreview%1}> + CLSS public abstract javax.lang.model.util.AbstractElementVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object> - anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_22) + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) cons protected init() meth public abstract {javax.lang.model.util.AbstractElementVisitor14%0} visitRecordComponent(javax.lang.model.element.RecordComponentElement,{javax.lang.model.util.AbstractElementVisitor14%1}) supr javax.lang.model.util.AbstractElementVisitor9<{javax.lang.model.util.AbstractElementVisitor14%0},{javax.lang.model.util.AbstractElementVisitor14%1}> @@ -2146,8 +2153,13 @@ cons protected init() meth public abstract {javax.lang.model.util.AbstractElementVisitor9%0} visitModule(javax.lang.model.element.ModuleElement,{javax.lang.model.util.AbstractElementVisitor9%1}) supr javax.lang.model.util.AbstractElementVisitor8<{javax.lang.model.util.AbstractElementVisitor9%0},{javax.lang.model.util.AbstractElementVisitor9%1}> +CLSS public abstract javax.lang.model.util.AbstractElementVisitorPreview<%0 extends java.lang.Object, %1 extends java.lang.Object> + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) +cons protected init() +supr javax.lang.model.util.AbstractElementVisitor14<{javax.lang.model.util.AbstractElementVisitorPreview%0},{javax.lang.model.util.AbstractElementVisitorPreview%1}> + CLSS public abstract javax.lang.model.util.AbstractTypeVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object> - anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_22) + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) cons protected init() supr javax.lang.model.util.AbstractTypeVisitor9<{javax.lang.model.util.AbstractTypeVisitor14%0},{javax.lang.model.util.AbstractTypeVisitor14%1}> @@ -2181,6 +2193,11 @@ CLSS public abstract javax.lang.model.util.AbstractTypeVisitor9<%0 extends java. cons protected init() supr javax.lang.model.util.AbstractTypeVisitor8<{javax.lang.model.util.AbstractTypeVisitor9%0},{javax.lang.model.util.AbstractTypeVisitor9%1}> +CLSS public abstract javax.lang.model.util.AbstractTypeVisitorPreview<%0 extends java.lang.Object, %1 extends java.lang.Object> + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) +cons protected init() +supr javax.lang.model.util.AbstractTypeVisitor14<{javax.lang.model.util.AbstractTypeVisitorPreview%0},{javax.lang.model.util.AbstractTypeVisitorPreview%1}> + CLSS public javax.lang.model.util.ElementFilter meth public static java.util.List constructorsIn(java.lang.Iterable) meth public static java.util.List methodsIn(java.lang.Iterable) @@ -2205,7 +2222,7 @@ supr java.lang.Object hfds CONSTRUCTOR_KIND,FIELD_KINDS,METHOD_KIND,MODULE_KIND,PACKAGE_KIND,RECORD_COMPONENT_KIND,TYPE_KINDS CLSS public javax.lang.model.util.ElementKindVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object> - anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_22) + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) cons protected init() cons protected init({javax.lang.model.util.ElementKindVisitor14%0}) meth public {javax.lang.model.util.ElementKindVisitor14%0} visitRecordComponent(javax.lang.model.element.RecordComponentElement,{javax.lang.model.util.ElementKindVisitor14%1}) @@ -2264,8 +2281,14 @@ cons protected init({javax.lang.model.util.ElementKindVisitor9%0}) meth public {javax.lang.model.util.ElementKindVisitor9%0} visitModule(javax.lang.model.element.ModuleElement,{javax.lang.model.util.ElementKindVisitor9%1}) supr javax.lang.model.util.ElementKindVisitor8<{javax.lang.model.util.ElementKindVisitor9%0},{javax.lang.model.util.ElementKindVisitor9%1}> +CLSS public javax.lang.model.util.ElementKindVisitorPreview<%0 extends java.lang.Object, %1 extends java.lang.Object> + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) +cons protected init() +cons protected init({javax.lang.model.util.ElementKindVisitorPreview%0}) +supr javax.lang.model.util.ElementKindVisitor14<{javax.lang.model.util.ElementKindVisitorPreview%0},{javax.lang.model.util.ElementKindVisitorPreview%1}> + CLSS public javax.lang.model.util.ElementScanner14<%0 extends java.lang.Object, %1 extends java.lang.Object> - anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_22) + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) cons protected init() cons protected init({javax.lang.model.util.ElementScanner14%0}) meth public {javax.lang.model.util.ElementScanner14%0} visitExecutable(javax.lang.model.element.ExecutableElement,{javax.lang.model.util.ElementScanner14%1}) @@ -2313,7 +2336,14 @@ cons protected init({javax.lang.model.util.ElementScanner9%0}) meth public {javax.lang.model.util.ElementScanner9%0} visitModule(javax.lang.model.element.ModuleElement,{javax.lang.model.util.ElementScanner9%1}) supr javax.lang.model.util.ElementScanner8<{javax.lang.model.util.ElementScanner9%0},{javax.lang.model.util.ElementScanner9%1}> +CLSS public javax.lang.model.util.ElementScannerPreview<%0 extends java.lang.Object, %1 extends java.lang.Object> + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) +cons protected init() +cons protected init({javax.lang.model.util.ElementScannerPreview%0}) +supr javax.lang.model.util.ElementScanner14<{javax.lang.model.util.ElementScannerPreview%0},{javax.lang.model.util.ElementScannerPreview%1}> + CLSS public abstract interface javax.lang.model.util.Elements +innr public final static !enum DocCommentKind innr public final static !enum Origin meth public abstract !varargs void printElements(java.io.Writer,javax.lang.model.element.Element[]) meth public abstract boolean hides(javax.lang.model.element.Element,javax.lang.model.element.Element) @@ -2344,11 +2374,20 @@ meth public javax.lang.model.element.RecordComponentElement recordComponentFor(j meth public javax.lang.model.element.TypeElement getEnumConstantBody(javax.lang.model.element.VariableElement) meth public javax.lang.model.element.TypeElement getOutermostTypeElement(javax.lang.model.element.Element) meth public javax.lang.model.element.TypeElement getTypeElement(javax.lang.model.element.ModuleElement,java.lang.CharSequence) +meth public javax.lang.model.util.Elements$DocCommentKind getDocCommentKind(javax.lang.model.element.Element) meth public javax.lang.model.util.Elements$Origin getOrigin(javax.lang.model.AnnotatedConstruct,javax.lang.model.element.AnnotationMirror) meth public javax.lang.model.util.Elements$Origin getOrigin(javax.lang.model.element.Element) meth public javax.lang.model.util.Elements$Origin getOrigin(javax.lang.model.element.ModuleElement,javax.lang.model.element.ModuleElement$Directive) meth public javax.tools.JavaFileObject getFileObjectOf(javax.lang.model.element.Element) +CLSS public final static !enum javax.lang.model.util.Elements$DocCommentKind + outer javax.lang.model.util.Elements +fld public final static javax.lang.model.util.Elements$DocCommentKind END_OF_LINE +fld public final static javax.lang.model.util.Elements$DocCommentKind TRADITIONAL +meth public static javax.lang.model.util.Elements$DocCommentKind valueOf(java.lang.String) +meth public static javax.lang.model.util.Elements$DocCommentKind[] values() +supr java.lang.Enum + CLSS public final static !enum javax.lang.model.util.Elements$Origin outer javax.lang.model.util.Elements fld public final static javax.lang.model.util.Elements$Origin EXPLICIT @@ -2360,7 +2399,7 @@ meth public static javax.lang.model.util.Elements$Origin[] values() supr java.lang.Enum CLSS public javax.lang.model.util.SimpleAnnotationValueVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object> - anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_22) + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) cons protected init() cons protected init({javax.lang.model.util.SimpleAnnotationValueVisitor14%0}) supr javax.lang.model.util.SimpleAnnotationValueVisitor9<{javax.lang.model.util.SimpleAnnotationValueVisitor14%0},{javax.lang.model.util.SimpleAnnotationValueVisitor14%1}> @@ -2408,8 +2447,14 @@ cons protected init() cons protected init({javax.lang.model.util.SimpleAnnotationValueVisitor9%0}) supr javax.lang.model.util.SimpleAnnotationValueVisitor8<{javax.lang.model.util.SimpleAnnotationValueVisitor9%0},{javax.lang.model.util.SimpleAnnotationValueVisitor9%1}> +CLSS public javax.lang.model.util.SimpleAnnotationValueVisitorPreview<%0 extends java.lang.Object, %1 extends java.lang.Object> + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) +cons protected init() +cons protected init({javax.lang.model.util.SimpleAnnotationValueVisitorPreview%0}) +supr javax.lang.model.util.SimpleAnnotationValueVisitor14<{javax.lang.model.util.SimpleAnnotationValueVisitorPreview%0},{javax.lang.model.util.SimpleAnnotationValueVisitorPreview%1}> + CLSS public javax.lang.model.util.SimpleElementVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object> - anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_22) + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) cons protected init() cons protected init({javax.lang.model.util.SimpleElementVisitor14%0}) meth public {javax.lang.model.util.SimpleElementVisitor14%0} visitRecordComponent(javax.lang.model.element.RecordComponentElement,{javax.lang.model.util.SimpleElementVisitor14%1}) @@ -2452,8 +2497,14 @@ cons protected init({javax.lang.model.util.SimpleElementVisitor9%0}) meth public {javax.lang.model.util.SimpleElementVisitor9%0} visitModule(javax.lang.model.element.ModuleElement,{javax.lang.model.util.SimpleElementVisitor9%1}) supr javax.lang.model.util.SimpleElementVisitor8<{javax.lang.model.util.SimpleElementVisitor9%0},{javax.lang.model.util.SimpleElementVisitor9%1}> +CLSS public javax.lang.model.util.SimpleElementVisitorPreview<%0 extends java.lang.Object, %1 extends java.lang.Object> + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) +cons protected init() +cons protected init({javax.lang.model.util.SimpleElementVisitorPreview%0}) +supr javax.lang.model.util.SimpleElementVisitor14<{javax.lang.model.util.SimpleElementVisitorPreview%0},{javax.lang.model.util.SimpleElementVisitorPreview%1}> + CLSS public javax.lang.model.util.SimpleTypeVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object> - anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_22) + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) cons protected init() cons protected init({javax.lang.model.util.SimpleTypeVisitor14%0}) supr javax.lang.model.util.SimpleTypeVisitor9<{javax.lang.model.util.SimpleTypeVisitor14%0},{javax.lang.model.util.SimpleTypeVisitor14%1}> @@ -2499,8 +2550,14 @@ cons protected init() cons protected init({javax.lang.model.util.SimpleTypeVisitor9%0}) supr javax.lang.model.util.SimpleTypeVisitor8<{javax.lang.model.util.SimpleTypeVisitor9%0},{javax.lang.model.util.SimpleTypeVisitor9%1}> +CLSS public javax.lang.model.util.SimpleTypeVisitorPreview<%0 extends java.lang.Object, %1 extends java.lang.Object> + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) +cons protected init() +cons protected init({javax.lang.model.util.SimpleTypeVisitorPreview%0}) +supr javax.lang.model.util.SimpleTypeVisitor14<{javax.lang.model.util.SimpleTypeVisitorPreview%0},{javax.lang.model.util.SimpleTypeVisitorPreview%1}> + CLSS public javax.lang.model.util.TypeKindVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object> - anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_22) + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) cons protected init() cons protected init({javax.lang.model.util.TypeKindVisitor14%0}) supr javax.lang.model.util.TypeKindVisitor9<{javax.lang.model.util.TypeKindVisitor14%0},{javax.lang.model.util.TypeKindVisitor14%1}> @@ -2550,7 +2607,14 @@ cons protected init({javax.lang.model.util.TypeKindVisitor9%0}) meth public {javax.lang.model.util.TypeKindVisitor9%0} visitNoTypeAsModule(javax.lang.model.type.NoType,{javax.lang.model.util.TypeKindVisitor9%1}) supr javax.lang.model.util.TypeKindVisitor8<{javax.lang.model.util.TypeKindVisitor9%0},{javax.lang.model.util.TypeKindVisitor9%1}> +CLSS public javax.lang.model.util.TypeKindVisitorPreview<%0 extends java.lang.Object, %1 extends java.lang.Object> + anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_23) +cons protected init() +cons protected init({javax.lang.model.util.TypeKindVisitorPreview%0}) +supr javax.lang.model.util.TypeKindVisitor14<{javax.lang.model.util.TypeKindVisitorPreview%0},{javax.lang.model.util.TypeKindVisitorPreview%1}> + CLSS public abstract interface javax.lang.model.util.Types +meth public <%0 extends javax.lang.model.type.TypeMirror> {%%0} stripAnnotations({%%0}) meth public abstract !varargs javax.lang.model.type.DeclaredType getDeclaredType(javax.lang.model.element.TypeElement,javax.lang.model.type.TypeMirror[]) meth public abstract !varargs javax.lang.model.type.DeclaredType getDeclaredType(javax.lang.model.type.DeclaredType,javax.lang.model.element.TypeElement,javax.lang.model.type.TypeMirror[]) meth public abstract boolean contains(javax.lang.model.type.TypeMirror,javax.lang.model.type.TypeMirror) @@ -2784,6 +2848,7 @@ meth public javax.lang.model.element.Modifier getAccessLevel() meth public javax.lang.model.element.NestingKind getNestingKind() meth public javax.tools.JavaFileObject$Kind getKind() meth public long getLastModified() +meth public static javax.tools.JavaFileObject forSource(java.net.URI,java.lang.String) supr java.lang.Object CLSS public abstract interface javax.tools.StandardJavaFileManager diff --git a/java/libs.javacapi/nbproject/project.xml b/java/libs.javacapi/nbproject/project.xml index 00cb13d7bae5..bf7b51480dfe 100644 --- a/java/libs.javacapi/nbproject/project.xml +++ b/java/libs.javacapi/nbproject/project.xml @@ -40,11 +40,11 @@ - external/nb-javac-jdk-22.0.1+8-api.jar + external/nb-javac-jdk-23+30-api.jar - external/nb-javac-jdk-22.0.1+8.jar + external/nb-javac-jdk-23+30.jar diff --git a/java/libs.nbjavacapi/external/binaries-list b/java/libs.nbjavacapi/external/binaries-list index bf8129d49f78..bac517586c21 100644 --- a/java/libs.nbjavacapi/external/binaries-list +++ b/java/libs.nbjavacapi/external/binaries-list @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -07266A99C001F11616B36F5128EB78D2242F3096 com.dukescript.nbjavac:nb-javac:jdk-22.0.1+8:api -D8B9FE09D677A6D589BA3C1E5AD636AF7F47AEE2 com.dukescript.nbjavac:nb-javac:jdk-22.0.1+8 +C251D126090F6362D805B1987372BF4963B3782C com.dukescript.nbjavac:nb-javac:jdk-23+30 +A9105543E5EB96B9705D338A4C42A3A89E25A19A com.dukescript.nbjavac:nb-javac:jdk-23+30:api diff --git a/java/libs.javacapi/external/nb-javac-jdk-22.0.1+8-license.txt b/java/libs.nbjavacapi/external/nb-javac-jdk-23+30-license.txt similarity index 99% rename from java/libs.javacapi/external/nb-javac-jdk-22.0.1+8-license.txt rename to java/libs.nbjavacapi/external/nb-javac-jdk-23+30-license.txt index 2fe171364534..0995f2175e2e 100644 --- a/java/libs.javacapi/external/nb-javac-jdk-22.0.1+8-license.txt +++ b/java/libs.nbjavacapi/external/nb-javac-jdk-23+30-license.txt @@ -1,10 +1,10 @@ Name: Javac Compiler Implementation Description: Javac Compiler Implementation -Version: jdk-22.0.1+8 -Files: nb-javac-jdk-22.0.1+8-api.jar nb-javac-jdk-22.0.1+8.jar +Version: 23+30 +Files: nb-javac-jdk-23+30-api.jar nb-javac-jdk-23+30.jar License: GPL-2-CP -Origin: OpenJDK (https://github.com/openjdk/jdk22u) -Source: https://github.com/openjdk/jdk22u +Origin: OpenJDK (https://github.com/openjdk/jdk) +Source: https://github.com/openjdk/jdk Type: optional,reviewed Comment: The binary has been reviewed to be under the Classpath Exception as a whole. Optional at runtime, but used by default. diff --git a/java/libs.nbjavacapi/nbproject/project.properties b/java/libs.nbjavacapi/nbproject/project.properties index 984e04c2ae7d..fae028a3b7f2 100644 --- a/java/libs.nbjavacapi/nbproject/project.properties +++ b/java/libs.nbjavacapi/nbproject/project.properties @@ -18,8 +18,8 @@ javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP -release.external/nb-javac-jdk-22.0.1+8-api.jar=modules/ext/nb-javac-jdk-22u1-8-api.jar -release.external/nb-javac-jdk-22.0.1+8.jar=modules/ext/nb-javac-jdk-22u1-8.jar +release.external/nb-javac-jdk-23+30-api.jar=modules/ext/nb-javac-jdk-23-30-api.jar +release.external/nb-javac-jdk-23+30.jar=modules/ext/nb-javac-jdk-23-30.jar # for tests requires.nb.javac=true diff --git a/java/libs.nbjavacapi/nbproject/project.xml b/java/libs.nbjavacapi/nbproject/project.xml index cd2641f524d1..20962f3edbc3 100644 --- a/java/libs.nbjavacapi/nbproject/project.xml +++ b/java/libs.nbjavacapi/nbproject/project.xml @@ -45,12 +45,12 @@ - ext/nb-javac-jdk-22u1-8-api.jar - external/nb-javac-jdk-22.0.1+8-api.jar + ext/nb-javac-jdk-23-30-api.jar + external/nb-javac-jdk-23+30-api.jar - ext/nb-javac-jdk-22u1-8.jar - external/nb-javac-jdk-22.0.1+8.jar + ext/nb-javac-jdk-23-30.jar + external/nb-javac-jdk-23+30.jar diff --git a/java/libs.nbjavacapi/src/org/netbeans/modules/nbjavac/api/Bundle.properties b/java/libs.nbjavacapi/src/org/netbeans/modules/nbjavac/api/Bundle.properties index 25d08eb6130b..6ebee3d11081 100644 --- a/java/libs.nbjavacapi/src/org/netbeans/modules/nbjavac/api/Bundle.properties +++ b/java/libs.nbjavacapi/src/org/netbeans/modules/nbjavac/api/Bundle.properties @@ -18,6 +18,6 @@ OpenIDE-Module-Display-Category=Java OpenIDE-Module-Long-Description=\ This library provides a Java language parser for the IDE. \ - Supports JDK-22 features. + Supports JDK-23 features. OpenIDE-Module-Name=The nb-javac Java editing support library OpenIDE-Module-Short-Description=The nb-javac Java editing support library diff --git a/java/refactoring.java/nbproject/org-netbeans-modules-refactoring-java.sig b/java/refactoring.java/nbproject/org-netbeans-modules-refactoring-java.sig index a37bcbcd6106..d3a2c7a6f210 100644 --- a/java/refactoring.java/nbproject/org-netbeans-modules-refactoring-java.sig +++ b/java/refactoring.java/nbproject/org-netbeans-modules-refactoring-java.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 1.86.0 +#Version 1.87.0 CLSS public abstract interface com.sun.source.doctree.DocTreeVisitor<%0 extends java.lang.Object, %1 extends java.lang.Object> meth public abstract {com.sun.source.doctree.DocTreeVisitor%0} visitAttribute(com.sun.source.doctree.AttributeTree,{com.sun.source.doctree.DocTreeVisitor%1}) @@ -36,6 +36,7 @@ meth public {com.sun.source.doctree.DocTreeVisitor%0} visitEscape(com.sun.source meth public {com.sun.source.doctree.DocTreeVisitor%0} visitHidden(com.sun.source.doctree.HiddenTree,{com.sun.source.doctree.DocTreeVisitor%1}) meth public {com.sun.source.doctree.DocTreeVisitor%0} visitIndex(com.sun.source.doctree.IndexTree,{com.sun.source.doctree.DocTreeVisitor%1}) meth public {com.sun.source.doctree.DocTreeVisitor%0} visitProvides(com.sun.source.doctree.ProvidesTree,{com.sun.source.doctree.DocTreeVisitor%1}) +meth public {com.sun.source.doctree.DocTreeVisitor%0} visitRawText(com.sun.source.doctree.RawTextTree,{com.sun.source.doctree.DocTreeVisitor%1}) meth public {com.sun.source.doctree.DocTreeVisitor%0} visitSnippet(com.sun.source.doctree.SnippetTree,{com.sun.source.doctree.DocTreeVisitor%1}) meth public {com.sun.source.doctree.DocTreeVisitor%0} visitSpec(com.sun.source.doctree.SpecTree,{com.sun.source.doctree.DocTreeVisitor%1}) meth public {com.sun.source.doctree.DocTreeVisitor%0} visitSummary(com.sun.source.doctree.SummaryTree,{com.sun.source.doctree.DocTreeVisitor%1}) @@ -97,7 +98,6 @@ meth public abstract {com.sun.source.tree.TreeVisitor%0} visitPrimitiveType(com. meth public abstract {com.sun.source.tree.TreeVisitor%0} visitProvides(com.sun.source.tree.ProvidesTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitRequires(com.sun.source.tree.RequiresTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitReturn(com.sun.source.tree.ReturnTree,{com.sun.source.tree.TreeVisitor%1}) -meth public abstract {com.sun.source.tree.TreeVisitor%0} visitStringTemplate(com.sun.source.tree.StringTemplateTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSwitch(com.sun.source.tree.SwitchTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSwitchExpression(com.sun.source.tree.SwitchExpressionTree,{com.sun.source.tree.TreeVisitor%1}) meth public abstract {com.sun.source.tree.TreeVisitor%0} visitSynchronized(com.sun.source.tree.SynchronizedTree,{com.sun.source.tree.TreeVisitor%1}) @@ -181,7 +181,6 @@ meth public {com.sun.source.util.TreeScanner%0} visitPrimitiveType(com.sun.sourc meth public {com.sun.source.util.TreeScanner%0} visitProvides(com.sun.source.tree.ProvidesTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitRequires(com.sun.source.tree.RequiresTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitReturn(com.sun.source.tree.ReturnTree,{com.sun.source.util.TreeScanner%1}) -meth public {com.sun.source.util.TreeScanner%0} visitStringTemplate(com.sun.source.tree.StringTemplateTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSwitch(com.sun.source.tree.SwitchTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSwitchExpression(com.sun.source.tree.SwitchExpressionTree,{com.sun.source.util.TreeScanner%1}) meth public {com.sun.source.util.TreeScanner%0} visitSynchronized(com.sun.source.tree.SynchronizedTree,{com.sun.source.util.TreeScanner%1}) diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index ae6e7b9e92d6..87d480f3d3a3 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -95,8 +95,8 @@ nb/ide.launcher/external/launcher-external-binaries-1-94a19f0.zip platform/o.n.b nb/ide.launcher/external/launcher-external-binaries-1-94a19f0.zip harness/apisupport.harness/external/launcher-external-binaries-1-94a19f0.zip # only one is part of the product: -java/libs.javacapi/external/nb-javac-jdk-22.0.1+8-api.jar java/libs.nbjavacapi/external/nb-javac-jdk-22.0.1+8-api.jar -java/libs.javacapi/external/nb-javac-jdk-22.0.1+8.jar java/libs.nbjavacapi/external/nb-javac-jdk-22.0.1+8.jar +java/libs.javacapi/external/nb-javac-jdk-23+30-api.jar java/libs.nbjavacapi/external/nb-javac-jdk-23+30-api.jar +java/libs.javacapi/external/nb-javac-jdk-23+30.jar java/libs.nbjavacapi/external/nb-javac-jdk-23+30.jar # Used only in unittests for mysql db specific tests ide/db.metadata.model/external/mysql-connector-j-8.0.31.jar ide/db.mysql/external/mysql-connector-j-8.0.31.jar diff --git a/platform/openide.util.lookup/test/unit/src/org/openide/util/test/AnnotationProcessorTestUtils.java b/platform/openide.util.lookup/test/unit/src/org/openide/util/test/AnnotationProcessorTestUtils.java index c3fff34fe96a..397ce4d2936c 100644 --- a/platform/openide.util.lookup/test/unit/src/org/openide/util/test/AnnotationProcessorTestUtils.java +++ b/platform/openide.util.lookup/test/unit/src/org/openide/util/test/AnnotationProcessorTestUtils.java @@ -94,7 +94,6 @@ public static boolean runJavac(File src, String srcIncludes, File dest, File[] c */ public static boolean runJavac(File src, String srcIncludes, File dest, File[] cp, OutputStream stderr, String source) { List args = new ArrayList(); - args.add("-classpath"); StringBuilder b = new StringBuilder(dest.getAbsolutePath()); if (cp != null) { for (File entry : cp) { @@ -104,7 +103,11 @@ public static boolean runJavac(File src, String srcIncludes, File dest, File[] c } else { b.append(File.pathSeparatorChar).append(System.getProperty("java.class.path")); } - args.add(b.toString()); + String classpath = b.toString(); + args.add("-classpath"); + args.add(classpath); + args.add("-processorpath"); + args.add(classpath); args.add("-d"); args.add(dest.getAbsolutePath()); args.add("-sourcepath");