[netbeans] branch master updated: [NETBEANS-4400] Added support for renaming RECORD name using refactoring (#2164)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 8469268 [NETBEANS-4400] Added support for renaming RECORD name using refactoring (#2164) 8469268 is described below commit 8469268155211b13baf2767ab7d1c7aefb7bc5d5 Author: Akhilesh Singh AuthorDate: Sun Jun 28 17:08:14 2020 +0530 [NETBEANS-4400] Added support for renaming RECORD name using refactoring (#2164) * [NETBEANS-4400] Added support for renaming RECORD name using refactoring * [NETBEANS-4400] Addressed code review comments --- .../java.source.base/src/org/netbeans/api/java/source/TreeMaker.java | 5 +++-- .../src/org/netbeans/modules/java/source/TreeShims.java | 4 2 files changed, 7 insertions(+), 2 deletions(-) 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 78710dc..7e2baa0 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 @@ -73,6 +73,7 @@ import org.netbeans.api.lexer.TokenHierarchy; import org.netbeans.api.lexer.TokenSequence; import org.netbeans.api.java.lexer.JavaTokenId; +import org.netbeans.modules.java.source.TreeShims; import org.netbeans.modules.java.source.builder.ASTService; import org.netbeans.modules.java.source.query.CommentSet; @@ -2869,8 +2870,8 @@ public final class TreeMaker { // todo (#pf): Shouldn't here be check that names are not the same? // i.e. node label == aLabel? -- every case branch has to check itself // This will improve performance, no change was done by API user. -Tree.Kind kind = node.getKind(); - +Tree.Kind kind = TreeShims.isRecord(node) ? Kind.CLASS : node.getKind(); + switch (kind) { case BREAK: { BreakTree t = (BreakTree) node; diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java b/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java index 11b1c04..5e7b042 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java @@ -199,6 +199,10 @@ public class TreeShims { public static boolean isRecord(Element el) { return el != null && "RECORD".equals(el.getKind().name()); } + +public static boolean isRecord(final N node) { +return node != null && TreeShims.RECORD.equals(node.getKind().name()); +} public static boolean isRecordComponent(Element el) { return el != null && "RECORD_COMPONENT".equals(el.getKind().name()); - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: [NETBEANS-3311] Convert TextBlock to String, Function call parameter fix test case fix (#2172)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new f1f3b46 [NETBEANS-3311] Convert TextBlock to String, Function call parameter fix test case fix (#2172) f1f3b46 is described below commit f1f3b46fb0b22a14a83f8e9e2899f3011b497405 Author: Akshay-Gupta-Oracle <55184560+akshay-gupta-ora...@users.noreply.github.com> AuthorDate: Fri Jun 12 09:40:38 2020 + [NETBEANS-3311] Convert TextBlock to String, Function call parameter fix test case fix (#2172) --- .../netbeans/modules/java/hints/jdk/ConvertTextBlockToStringTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertTextBlockToStringTest.java b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertTextBlockToStringTest.java index 3c61941..a209f8e 100644 --- a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertTextBlockToStringTest.java +++ b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertTextBlockToStringTest.java @@ -387,7 +387,7 @@ public class ConvertTextBlockToStringTest { .sourceLevel(SourceVersion.latest().name()) .options("--enable-preview") .run(ConvertTextBlockToString.class) -.findWarning("3:18-3:21:verifier:" + Bundle.ERR_ConvertTextBlockToString()) +.findWarning("4:27-4:30:verifier:" + Bundle.ERR_ConvertTextBlockToString()) .applyFix() .assertCompilable() .assertOutput("package test;\n" @@ -419,7 +419,7 @@ public class ConvertTextBlockToStringTest { .sourceLevel(SourceVersion.latest().name()) .options("--enable-preview") .run(ConvertTextBlockToString.class) -.findWarning("3:18-3:21:verifier:" + Bundle.ERR_ConvertTextBlockToString()) +.findWarning("2:27-2:30:verifier:" + Bundle.ERR_ConvertTextBlockToString()) .applyFix() .assertCompilable() .assertOutput("class myClass{\n" - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated (794f30a -> 12ec73d)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 794f30a [NETBEANS-3580] : Fixed lambda debug breakpoint issue by processing all location event coming from vm (#2055) add 12ec73d [NETBEANS-3311] Convert TextBlock to String Function call parameter fix (#2089) No new revisions were added by this update. Summary of changes: .../hints/jdk/ConvertTextBlockToStringTest.java| 63 +- .../modules/java/source/save/CasualDiff.java | 8 ++- 2 files changed, 68 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated (5222352 -> 794f30a)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 5222352 Merge pull request #2100 from entlicher/TruffleDebugUpdate2020-04 add 794f30a [NETBEANS-3580] : Fixed lambda debug breakpoint issue by processing all location event coming from vm (#2055) No new revisions were added by this update. Summary of changes: .../jpda/breakpoints/LineBreakpointImpl.java | 47 +++-- .../jpda/ExpressionLambdaBreakpointTest.java | 203 + .../api/debugger/jpda/ExpressionStepTest.java | 14 ++ .../testapps/ExpressionLambdaBreakpointApp.java| 38 .../debugger/jpda/testapps/ExpressionStepApp.java | 2 + 5 files changed, 285 insertions(+), 19 deletions(-) create mode 100644 java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/ExpressionLambdaBreakpointTest.java create mode 100644 java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/ExpressionLambdaBreakpointApp.java - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
svn commit: r38364 - in /release/netbeans/netbeans/11.3: Apache-NetBeans-11.3-bin-macosx.dmg.asc Apache-NetBeans-11.3-bin-macosx.dmg.sha512
Author: arusinha Date: Tue Mar 3 07:51:19 2020 New Revision: 38364 Log: NetBeans-11.3 MAC Installers Added: release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-macosx.dmg.asc release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-macosx.dmg.sha512 Added: release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-macosx.dmg.asc == --- release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-macosx.dmg.asc (added) +++ release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-macosx.dmg.asc Tue Mar 3 07:51:19 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJeWQK3AAoJEG+oY7DDKhixqF8P/RF5BZkZVGq/8x9JlLxW3043 +DKll6dZOFX/P9FCfa4Kp/0tcKgAA4V9rDsiTimK5qP1ofvsgikhc68GZWMlH0gxl +j0isaVWsKgckgBjmEGTc7AGMx8L3YW0AobWEwrXBIeGAjHoHkC1lzrTBLVucz5D7 +ECDwf3gfzWzYBhCD754PoodImsmn+PTm6KgPsVi83YA9IRq/ejsSTSqZLBvgAluS +MAywW0nz21/ailqKHsQop5X13oxj78+bEhLfp4/lezXsuBiE/GzY8G70M8MZ/sDM +e3A8kBy76qhGXVfhUxBUI331gtIgqwRGrfZzJCFOGQ0zKZwwwZDblXawuwTz2wV6 +6TsHXXq8l04Vhqz+Na7pd+wwoDEz4ezjN6Lgy9Z4e/L1uRh0WaYX4XKnbBQ1oKlz +9tyQGRrtMGuY3mRsHlV1QhOs5xqN8ERkwpEdWSCw22R3eJOSp4u3enmK0lMnlv8N +ES8tjwPC0vwdBumul3uhxgs9RmedweAIIssf0DK6JQpXgLbl6GIRhzczywZX5jTK +Z/3Podm3djk3g2JsnXn9/JiC/gaBT/AV8X6it+lDqJui2pn7Tq1ku1qZCZshVcGy +J5AppSc/B7wjsSY5/fC2k1V3JDAcma807PAlN3cKxPOo2YWE0xzoTZY7noEOnL5j +Bqjc+df1aBOftsbcwLgR +=4fCC +-END PGP SIGNATURE- Added: release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-macosx.dmg.sha512 == --- release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-macosx.dmg.sha512 (added) +++ release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-macosx.dmg.sha512 Tue Mar 3 07:51:19 2020 @@ -0,0 +1 @@ +976c28a0f2d0b63a8839bc011dade9e8501bc21556dadc1c923ff805083226a300885a8be108b9d30fe66c0c3ec8bc4f78be367f3e36bed5d6f5de47d49bbfe3 Apache-NetBeans-11.3-bin-macosx.dmg - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
svn commit: r38363 - /release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-macosx.dmg
Author: arusinha Date: Tue Mar 3 07:50:09 2020 New Revision: 38363 Log: NetBeans-11.3 MAC Installers Added: release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-macosx.dmg - copied unchanged from r38362, dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
svn commit: r38362 - in /release/netbeans/netbeans/11.3: Apache-NetBeans-11.3-bin-windows-x64.exe Apache-NetBeans-11.3-bin-windows-x64.exe.asc Apache-NetBeans-11.3-bin-windows-x64.exe.sha512
Author: arusinha Date: Tue Mar 3 07:39:08 2020 New Revision: 38362 Log: NetBeans-11.3 Windows Installers Added: release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-windows-x64.exe (with props) release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-windows-x64.exe.asc release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-windows-x64.exe.sha512 Added: release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-windows-x64.exe == Binary file - no diff available. Propchange: release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-windows-x64.exe -- svn:mime-type = application/octet-stream Added: release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-windows-x64.exe.asc == --- release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-windows-x64.exe.asc (added) +++ release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-windows-x64.exe.asc Tue Mar 3 07:39:08 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJeWQHiAAoJEG+oY7DDKhix9CcP+gJsIVXpUN6PLZLSnyBp/6i7 +P1i1FNiOdNuc914bFICXqSFc86UTQIZtE8K5xHyfoR2ZM+hoCVmIrjAnwnBByrB6 +f9iKN6+qF171Q+eu/pIuNN5Ano6kH1WHgwmX0wTU5F+IHrYqkRe/l7xJJr3G0gx9 +UEmW7ZVbhjbNRaENtP5OJ2YuOzgHcbxQChrbA6xXKKbQK+bBZPGXYsSyT+SiTMtA +2XwuIe5buFJV9Mv5E72qpHqqoj99RLpiXKjwtbplbrpLQa0nVbfgPtNGzxfuFFCs +FL2n2t2ZG31TrowhfbIztJDofeTjoyjwC1VKZrVGzswuftlxGQK6PVRw9dMNodxv +tWlQLZ7JY+mhJGWpLaMu5FruZJppQnxpgpQjeLA3Amk7RB0ptTiOEPKshJXJ1HG0 +pKHOjKCjPMHHwls51m92n7UHK0La6SbQVJ5GObWHXSLQswQIwnVq8kdMmLmHQyOM +JtkvHDp3TpaxLzGOgtyaaS0Xy8vnlH04OdMcWQGE4RZv4PErWxVOrRK/cDYSgrNL +P2W2zBSUcTTqMBMVqDztzu65naZror+fHbG7Du9XS1kZ1XnR+ScQA9UQufi5NWCO +R0Y0hTtOvPF8GJNOuKYv49y/p1k4TlqzNncS6EqXBJryM3zhXVJ8va8MG+K7g6eq +26twSg3XtC+G41EwEybj +=pY1o +-END PGP SIGNATURE- Added: release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-windows-x64.exe.sha512 == --- release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-windows-x64.exe.sha512 (added) +++ release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-windows-x64.exe.sha512 Tue Mar 3 07:39:08 2020 @@ -0,0 +1 @@ +1e3cb8aa431f6ab3ef484471d7b33233bc2a13c1e9c69749711e0816af39fc59ca1c9e55045f09e85a519a36384321f883e7d7587dd6fe1b10dd016b8c385a6d Apache-NetBeans-11.3-bin-windows-x64.exe - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
svn commit: r38361 [1/2] - in /release/netbeans/netbeans/11.3: Apache-NetBeans-11.3-bin-linux-x64.sh Apache-NetBeans-11.3-bin-linux-x64.sh.asc Apache-NetBeans-11.3-bin-linux-x64.sh.sha512
Author: arusinha Date: Tue Mar 3 07:36:40 2020 New Revision: 38361 Log: NetBeans-11.3 Linux Installers Added: release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-linux-x64.sh release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-linux-x64.sh.asc release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-linux-x64.sh.sha512 Added: release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-linux-x64.sh == --- release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-linux-x64.sh (added) +++ release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-linux-x64.sh Tue Mar 3 07:36:40 2020 @@ -0,0 +1,772185 @@ +#!/bin/sh +# +# 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. +# + +ARG_JAVAHOME="--javahome" +ARG_VERBOSE="--verbose" +ARG_OUTPUT="--output" +ARG_EXTRACT="--extract" +ARG_JAVA_ARG_PREFIX="-J" +ARG_TEMPDIR="--tempdir" +ARG_CLASSPATHA="--classpath-append" +ARG_CLASSPATHP="--classpath-prepend" +ARG_HELP="--help" +ARG_SILENT="--silent" +ARG_NOSPACECHECK="--nospacecheck" +ARG_LOCALE="--locale" + +USE_DEBUG_OUTPUT=0 +PERFORM_FREE_SPACE_CHECK=1 +SILENT_MODE=0 +EXTRACT_ONLY=0 +SHOW_HELP_ONLY=0 +LOCAL_OVERRIDDEN=0 +APPEND_CP= +PREPEND_CP= +LAUNCHER_APP_ARGUMENTS= +LAUNCHER_JVM_ARGUMENTS= +ERROR_OK=0 +ERROR_TEMP_DIRECTORY=2 +ERROR_TEST_JVM_FILE=3 +ERROR_JVM_NOT_FOUND=4 +ERROR_JVM_UNCOMPATIBLE=5 +ERROR_EXTRACT_ONLY=6 +ERROR_INPUTOUPUT=7 +ERROR_FREESPACE=8 +ERROR_INTEGRITY=9 +ERROR_MISSING_RESOURCES=10 +ERROR_JVM_EXTRACTION=11 +ERROR_JVM_UNPACKING=12 +ERROR_VERIFY_BUNDLED_JVM=13 + +VERIFY_OK=1 +VERIFY_NOJAVA=2 +VERIFY_UNCOMPATIBLE=3 + +MSG_ERROR_JVM_NOT_FOUND="nlu.jvm.notfoundmessage" +MSG_ERROR_USER_ERROR="nlu.jvm.usererror" +MSG_ERROR_JVM_UNCOMPATIBLE="nlu.jvm.uncompatible" +MSG_ERROR_INTEGRITY="nlu.integrity" +MSG_ERROR_FREESPACE="nlu.freespace" +MSG_ERROP_MISSING_RESOURCE="nlu.missing.external.resource" +MSG_ERROR_TMPDIR="nlu.cannot.create.tmpdir" + +MSG_ERROR_EXTRACT_JVM="nlu.cannot.extract.bundled.jvm" +MSG_ERROR_UNPACK_JVM_FILE="nlu.cannot.unpack.jvm.file" +MSG_ERROR_VERIFY_BUNDLED_JVM="nlu.error.verify.bundled.jvm" + +MSG_RUNNING="nlu.running" +MSG_STARTING="nlu.starting" +MSG_EXTRACTING="nlu.extracting" +MSG_PREPARE_JVM="nlu.prepare.jvm" +MSG_JVM_SEARCH="nlu.jvm.search" +MSG_ARG_JAVAHOME="nlu.arg.javahome" +MSG_ARG_VERBOSE="nlu.arg.verbose" +MSG_ARG_OUTPUT="nlu.arg.output" +MSG_ARG_EXTRACT="nlu.arg.extract" +MSG_ARG_TEMPDIR="nlu.arg.tempdir" +MSG_ARG_CPA="nlu.arg.cpa" +MSG_ARG_CPP="nlu.arg.cpp" +MSG_ARG_DISABLE_FREE_SPACE_CHECK="nlu.arg.disable.space.check" +MSG_ARG_LOCALE="nlu.arg.locale" +MSG_ARG_SILENT="nlu.arg.silent" +MSG_ARG_HELP="nlu.arg.help" +MSG_USAGE="nlu.msg.usage" + +isSymlink= + +entryPoint() { +initSymlinkArgument + CURRENT_DIRECTORY=`pwd` + LAUNCHER_NAME=`echo $0` + parseCommandLineArguments "$@" + initializeVariables + setLauncherLocale + debugLauncherArguments "$@" + if [ 1 -eq $SHOW_HELP_ONLY ] ; then + showHelp + fi + +message "$MSG_STARTING" +createTempDirectory + checkFreeSpace "$TOTAL_BUNDLED_FILES_SIZE" "$LAUNCHER_EXTRACT_DIR" + +extractJVMData + if [ 0 -eq $EXTRACT_ONLY ] ; then +searchJava + fi + + extractBundledData + verifyIntegrity + + if [ 0 -eq $EXTRACT_ONLY ] ; then + executeMainClass + else + exitProgram $ERROR_OK + fi +} + +initSymlinkArgument() { +testSymlinkErr=`test -L / 2>&1 > /dev/null` +if [ -z "$testSymlinkErr" ] ; then +isSymlink=-L +else +isSymlink=-h +fi +} + +debugLauncherArguments() { + debug
svn commit: r38361 [2/2] - in /release/netbeans/netbeans/11.3: Apache-NetBeans-11.3-bin-linux-x64.sh Apache-NetBeans-11.3-bin-linux-x64.sh.asc Apache-NetBeans-11.3-bin-linux-x64.sh.sha512
Added: release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-linux-x64.sh.asc == --- release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-linux-x64.sh.asc (added) +++ release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-linux-x64.sh.asc Tue Mar 3 07:36:40 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJeWQJ5AAoJEG+oY7DDKhixyL8P/jK217VqFs1JkzzfQjmT24iB +6xLDKscRrWhyL3MHHSOiSpVCEQSpic0LmqCfy4c9dHf86jJaMGwXxxfQ2IvV39zM +XmhMAm+iz6q85SG6CAED4dPoWDXnKuYKnr4Qq79aDxESFkxAZ5qf0malskglXzty +xmnid8O4Qj/PrF010fcXtIEClC2SeVsZqHHTJFpgmYSezDw0KcwqoSpD1qDHXhxK +Y5wqBJJO3l3qOKKZPuQXwjmtHRdM1nEX/tVzacLFXQb84ufleoopdw87eyrj02ZI +tVddeNs0aOKo6ydacYQCkhj6kFVsBFtiogQ9PO8+tDYsS+yUKuhlmdvnN0/S/MYP +wLFEjEbcwyW9jg2x5Y02jb8BcysVndc6gtL3gaLyuqeONgMMg7Elk5RQ6zebkDMa +utzS4lW1fXqFAjbasp9/UqtoaimC66aCmtDjNRYpUzDuk7kpW6+3ieLUcc7u6xAh +MC0uEUeYLWQzj+QwI8jBJsLfT00IzCXh1vt5A5/mgsWjJ+gKWbD7ML7q9i9ws5hK +najIy8wuELp3hh+a1TwvsujB52gkpOtLCWf8F1EUFKRLlsaK9XvlUfkcNSBe9Bql +76xuO26T3QXZccfzqFCzK3elrQjSLeQUBWnOmPREic2Jx5sbsS1FY3jdJ5FVsW06 +6M92yo0HK4di5Jrp6QYt +=WBku +-END PGP SIGNATURE- Added: release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-linux-x64.sh.sha512 == --- release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-linux-x64.sh.sha512 (added) +++ release/netbeans/netbeans/11.3/Apache-NetBeans-11.3-bin-linux-x64.sh.sha512 Tue Mar 3 07:36:40 2020 @@ -0,0 +1 @@ +221b89699f615e3ac568f73c7678f16042966f30cf24e150ef5d94a80c769cde85332611984c84d8e3cf144f8ed2138bd4357c96461283f84ac8cf3fe77caf56 Apache-NetBeans-11.3-bin-linux-x64.sh - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
svn commit: r38320 - /dev/netbeans/netbeans/11.3/installers/
Author: arusinha Date: Fri Feb 28 12:30:48 2020 New Revision: 38320 Log: Adding sha512 checksum and PGP signature for Installers Added: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-linux-x64.sh.asc dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-linux-x64.sh.sha512 dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg.asc dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg.sha512 dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-windows-x64.exe.asc dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-windows-x64.exe.sha512 Added: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-linux-x64.sh.asc == --- dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-linux-x64.sh.asc (added) +++ dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-linux-x64.sh.asc Fri Feb 28 12:30:48 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJeWQJ5AAoJEG+oY7DDKhixyL8P/jK217VqFs1JkzzfQjmT24iB +6xLDKscRrWhyL3MHHSOiSpVCEQSpic0LmqCfy4c9dHf86jJaMGwXxxfQ2IvV39zM +XmhMAm+iz6q85SG6CAED4dPoWDXnKuYKnr4Qq79aDxESFkxAZ5qf0malskglXzty +xmnid8O4Qj/PrF010fcXtIEClC2SeVsZqHHTJFpgmYSezDw0KcwqoSpD1qDHXhxK +Y5wqBJJO3l3qOKKZPuQXwjmtHRdM1nEX/tVzacLFXQb84ufleoopdw87eyrj02ZI +tVddeNs0aOKo6ydacYQCkhj6kFVsBFtiogQ9PO8+tDYsS+yUKuhlmdvnN0/S/MYP +wLFEjEbcwyW9jg2x5Y02jb8BcysVndc6gtL3gaLyuqeONgMMg7Elk5RQ6zebkDMa +utzS4lW1fXqFAjbasp9/UqtoaimC66aCmtDjNRYpUzDuk7kpW6+3ieLUcc7u6xAh +MC0uEUeYLWQzj+QwI8jBJsLfT00IzCXh1vt5A5/mgsWjJ+gKWbD7ML7q9i9ws5hK +najIy8wuELp3hh+a1TwvsujB52gkpOtLCWf8F1EUFKRLlsaK9XvlUfkcNSBe9Bql +76xuO26T3QXZccfzqFCzK3elrQjSLeQUBWnOmPREic2Jx5sbsS1FY3jdJ5FVsW06 +6M92yo0HK4di5Jrp6QYt +=WBku +-END PGP SIGNATURE- Added: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-linux-x64.sh.sha512 == --- dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-linux-x64.sh.sha512 (added) +++ dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-linux-x64.sh.sha512 Fri Feb 28 12:30:48 2020 @@ -0,0 +1 @@ +221b89699f615e3ac568f73c7678f16042966f30cf24e150ef5d94a80c769cde85332611984c84d8e3cf144f8ed2138bd4357c96461283f84ac8cf3fe77caf56 Apache-NetBeans-11.3-bin-linux-x64.sh Added: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg.asc == --- dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg.asc (added) +++ dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg.asc Fri Feb 28 12:30:48 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJeWQK3AAoJEG+oY7DDKhixqF8P/RF5BZkZVGq/8x9JlLxW3043 +DKll6dZOFX/P9FCfa4Kp/0tcKgAA4V9rDsiTimK5qP1ofvsgikhc68GZWMlH0gxl +j0isaVWsKgckgBjmEGTc7AGMx8L3YW0AobWEwrXBIeGAjHoHkC1lzrTBLVucz5D7 +ECDwf3gfzWzYBhCD754PoodImsmn+PTm6KgPsVi83YA9IRq/ejsSTSqZLBvgAluS +MAywW0nz21/ailqKHsQop5X13oxj78+bEhLfp4/lezXsuBiE/GzY8G70M8MZ/sDM +e3A8kBy76qhGXVfhUxBUI331gtIgqwRGrfZzJCFOGQ0zKZwwwZDblXawuwTz2wV6 +6TsHXXq8l04Vhqz+Na7pd+wwoDEz4ezjN6Lgy9Z4e/L1uRh0WaYX4XKnbBQ1oKlz +9tyQGRrtMGuY3mRsHlV1QhOs5xqN8ERkwpEdWSCw22R3eJOSp4u3enmK0lMnlv8N +ES8tjwPC0vwdBumul3uhxgs9RmedweAIIssf0DK6JQpXgLbl6GIRhzczywZX5jTK +Z/3Podm3djk3g2JsnXn9/JiC/gaBT/AV8X6it+lDqJui2pn7Tq1ku1qZCZshVcGy +J5AppSc/B7wjsSY5/fC2k1V3JDAcma807PAlN3cKxPOo2YWE0xzoTZY7noEOnL5j +Bqjc+df1aBOftsbcwLgR +=4fCC +-END PGP SIGNATURE- Added: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg.sha512 == --- dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg.sha512 (added) +++ dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg.sha512 Fri Feb 28 12:30:48 2020 @@ -0,0 +1 @@ +976c28a0f2d0b63a8839bc011dade9e8501bc21556dadc1c923ff805083226a300885a8be108b9d30fe66c0c3ec8bc4f78be367f3e36bed5d6f5de47d49bbfe3 Apache-NetBeans-11.3-bin-macosx.dmg Added: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-windows-x64.exe.asc == --- dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-windows-x64.exe.asc (added) +++ dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-windows-x64.exe.asc Fri Feb 28 12:30:48 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJeWQHiAAoJEG+oY7DDKhix9CcP+gJsIVXpUN6PLZLSnyBp/6i7 +P1i1FNiOdNuc914bFICXqSFc86UTQIZtE8K5xHyfoR2ZM+hoCVmIrjAnwnBByrB6 +f9iKN6+qF171Q+eu/pIuNN5Ano6kH1WHgwmX0wTU5F+IHrYqkRe/l7xJJr3G0gx9 +UEmW7ZVbhjbNRaENtP5OJ2YuOzgHcbxQChrbA6xXKKbQK+bBZPGXYsSyT+SiTMtA
svn commit: r38319 - /release/netbeans/KEYS
Author: arusinha Date: Fri Feb 28 11:48:53 2020 New Revision: 38319 Log: Apache NetBeans-11.3 Installers Modified: release/netbeans/KEYS Modified: release/netbeans/KEYS == --- release/netbeans/KEYS (original) +++ release/netbeans/KEYS Fri Feb 28 11:48:53 2020 @@ -487,3 +487,61 @@ bfEiXujDPvSJPRsoQiZCqw6AjUENxY75B1CORhBE ponkU84= =tPeI -END PGP PUBLIC KEY BLOCK- +pub 4096R/C32A18B1 2020-02-25 +uid Arunava Sinha (CODE SIGNING KEY) +sig 3C32A18B1 2020-02-25 Arunava Sinha (CODE SIGNING KEY) +sub 4096R/D8BE1F21 2020-02-25 +sig C32A18B1 2020-02-25 Arunava Sinha (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v2.0.22 (GNU/Linux) + +mQINBF5U/YUBEACp4qMiibGMrajNgjds3fYhas+UXhZUADh6FaLRy+BCaCLhKPst +LUm9huc4ybw3U5BxrY+9Z8vdReg/fgvk8b+xGbNhMJCpEvq6MVp7Rr6BwdAPNu9N +MYsmaiFKR+IPbhJURoAK8hxVxs+WKMLZlpj8s0T2mF6IT+gK0tOGNol/hJeXG52E +EnyqxTBFXPB9nv52qiFdGGhoq4BVEkTWme2egKVXPYMcglhlW3QoZXCxuwtMX4sy +B9Vp3effkH94VBQgOzbEyjjsJrurbnt1ujR4na8lkmgt6VbRtDfea1tHKuVlr0i+ +BMhBentKoBqs23wAlujQuU0QrhcMtsy7VroYMRQW4GfZVqPVfNBuVM29sYjfuLBV +uiobYx5FbN8xK5LGCg7X9BAMib7XfF3rzovjNOrfXzFMBL5wb4YJraFxX1xDXIQ6 +hEV+acMuBejzDZVhHhyUMcDO003rt61zX2+GgqabFrNwd/A28Ve2KBc/SKb+twBf +b2uQ3CuBoZ+dQU83oa5iTJqxts+cfciR0qNuUNpARCPPtcLx3ADwbNfNbGGYiUtJ +WCc9bPCRSTg1hLKkVMdU95L43c7iJVIKPYJZ7f6YTpRhN/m+Jf28nOdKr9/PKkBk +Kl0gEChFBxMGqaaLNUKZ+RMfLJCRh/SNnLTWWmNm2G5hW1U/8NmOqj0DVQARAQAB +tDZBcnVuYXZhIFNpbmhhIChDT0RFIFNJR05JTkcgS0VZKSA8YXJ1c2luaGFAYXBh +Y2hlLm9yZz6JAjcEEwECACECGwMCHgECF4AFAl5VAQEFCwkIBwMFFQoJCAsFFgID +AQAACgkQb6hjsMMqGLGvAw/7BHaSEkzQxXd12tw10dkHEmf9IJLkjqSuRJpDzjRn +tG9h4MoQ5n/Yn0R51loStONAT3KPjfu3X4KhOoi4qNd3AhTBmR504Sjgp5rRA5io +51nUm1EsFtNCyqarYTM/76JidNrTsIsc4RNO1cM91F2Nep9K/fB2zs3836Y5dRxy +MjTVwBySO5D8lbTyYq4uIlvDaByuR3Qwmab//yiPDkBnGOfo0rIIHquKIXqQzrc/ +q71foO/XHxlTZ28y6ufWdtNoteo/nS7WRUCjPqqzRDvFYqRWZqsrEkAYVj24iKB9 +myzVSRhOkkxUmjPANrsaEUzvZosTC0JGgSpR6rZ1sQjrKJ/I4p26pK/Fmm8hfd5D +6CsofFx5qodcdVCTQPt8xPWR1VrzjnmsYvEroMJ3/jefM8yGR7oUX1Qg5VbeEZMl +kyrTY2C8eYwOKTBKIsXe/UitOkrnWzgrm5r7s/J2SMf/XOucgO7oa1SJNrcfKwTc +uHCXjOpZlK8Zb4ko/KZ3HdZ6hcJWF1JDFeR2HFmRISNte/7BH0sPVXB4wVSeT2Qx +99/Xkr9gJKZ0xJBOkXm2qHxUMhSujtWQy6wjbzvdmq4gCI4kvz41UC8MWfViIGtd +GeIPR43CIUar2Qe73sOQmEvtMmssWXBj/nMK2tb3R7Q20hvn9EZTCGjKWEKedxgE +uru5Ag0EXlT9hQEQALJkLDLvrTnbolUG5t2/LGgIbw6R7ZJnIkk/ty1PUT58M6oj ++5SKoFo6A38OxZhZeF3Q1cXffVcXpa00LUH3eLlZ+WbKlY2KFZ9+wmmrHHKZ0QnT +wArlXn5Vq1gN+ZyP+/W389YmWpbjfrCPXfmM0RKbSkVDsCi8bPn0gP1FoobKrzCl +jZkLp++ysVCuv0pXu1ALvSsoxHtUBL0PZRGaat5tSgpcyK16PJUUmVjWd2qWfm4z +QKzZc1PSeWT8NfAYOtcw3qQVOHIJupfgmzEHdCcrinAWIITdRtucZ9u4gwAvkqDi +LSchDwF5plKTjxrtZCEpv3u+DRcfZG0YF8AQC9+K1Eg3BTmfLGJw/lVz+ILCEUHf +yACAu8YESEvaD4iVW4d9jJjJED45VHuwUUWqEDX+R4EHnB15CiKsoSAHcV/3cKAT +lfhFGVJ6eLZWM0/whNgVLahK1YdqrAith3bscppMTZNNoeQ0WE+N411Vkt744eju +YJJmBbfzm+ix2rSS8BL/qT/MtWIMgz8k7iOFRdCJJDXal3paRtpb82CJuEfwGeyi +VN7+1P8LC/ZjpkjFSCLBH9XzNDEcf1S0jeYoRs1/sPusthCLUvtMxQIXaOg2Yxhc +Q+xw/ClMBZdFh24s+bCGC0Vdx8FFw5sDFDQEVHjXTiqYtoASwLo/XxtwHVb9ABEB +AAGJAh8EGAECAAkFAl5U/YUCGwwACgkQb6hjsMMqGLHDRQ/8DiFa/l3gSGCl1gMc +SOkZKinAumPtcdofwpPEQDxMq+uQxLMMMn6aDo74OJFxmTX50USR7DWkEtLvOR3z +EYrs/sitTXASiAyh7Qlfh4I+azdxiN9OhoEmpkh9TP7LEqCpa6UsLRj18l8S0Bzb +IKJxK0FRuBcQQPHaLioAxgrTL6gga+csSjD9kjzUs0Ri+gRBxyhFuheOVdXv79Xk +MRnsLQg33rQNLZbsqMT3b5B0Bbt4WQvxKuiNaFwBmiC3H3qhgxly2Rc1rq2UGXHC +uj0YDXFnf+5vZFMdsRQVyA2k3WWf2wHK1RsxUUdQEOPdyy4I7cOcj0EPMoZD6yHv +BjPC50JL/dpIYY2SyHVVOjXdD7nokf59FVfqh1ncSJ9G5jCeigpdmKH9IQAsKIIK +N8O7NJkzO8AKZvTOTC5BE7zbozNKE528Q+rRk0S/f/gWlLQoJDjKe+qU1DSY2WzB +VnSMPT7zive3wyvTZI7t6/1IPnIQI2AemmilFMBZH3tzAl8FMZhXdjgmfrIZZRnF +8uoYF4ELARphq5+zPAEmEhFPnboi2GbiFjgfRJ9m9VzsVjgJe183c7lH9pDegskE +q7+IufGbZu02XDhaqQxYoyguc3gg1HPfSkyBKQW/56RfWjQeVIfcENdvSgML/SgL +G/YoIFU/rhl0URcVauN1Z9ELSMk= +=NuiM +-END PGP PUBLIC KEY BLOCK- - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
svn commit: r38316 - /dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg
Author: arusinha Date: Fri Feb 28 10:03:40 2020 New Revision: 38316 Log: Notarized mac installer for Netbeans-11.3 Modified: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg Modified: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg == Binary files - no diff available. - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
svn commit: r38282 - /dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-windows-x64.exe
Author: arusinha Date: Tue Feb 25 08:54:21 2020 New Revision: 38282 Log: Windows installer for NetBeans-11.3 Added: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-windows-x64.exe (with props) Added: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-windows-x64.exe == Binary file - no diff available. Propchange: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-windows-x64.exe -- svn:mime-type = application/octet-stream - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
svn commit: r38281 - /dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-linux-x64.sh
Author: arusinha Date: Tue Feb 25 08:39:46 2020 New Revision: 38281 Log: Linux installer for NetBeans-11.3 Added: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-linux-x64.sh Added: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-linux-x64.sh == --- dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-linux-x64.sh (added) +++ dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-linux-x64.sh Tue Feb 25 08:39:46 2020 @@ -0,0 +1,772185 @@ +#!/bin/sh +# +# 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. +# + +ARG_JAVAHOME="--javahome" +ARG_VERBOSE="--verbose" +ARG_OUTPUT="--output" +ARG_EXTRACT="--extract" +ARG_JAVA_ARG_PREFIX="-J" +ARG_TEMPDIR="--tempdir" +ARG_CLASSPATHA="--classpath-append" +ARG_CLASSPATHP="--classpath-prepend" +ARG_HELP="--help" +ARG_SILENT="--silent" +ARG_NOSPACECHECK="--nospacecheck" +ARG_LOCALE="--locale" + +USE_DEBUG_OUTPUT=0 +PERFORM_FREE_SPACE_CHECK=1 +SILENT_MODE=0 +EXTRACT_ONLY=0 +SHOW_HELP_ONLY=0 +LOCAL_OVERRIDDEN=0 +APPEND_CP= +PREPEND_CP= +LAUNCHER_APP_ARGUMENTS= +LAUNCHER_JVM_ARGUMENTS= +ERROR_OK=0 +ERROR_TEMP_DIRECTORY=2 +ERROR_TEST_JVM_FILE=3 +ERROR_JVM_NOT_FOUND=4 +ERROR_JVM_UNCOMPATIBLE=5 +ERROR_EXTRACT_ONLY=6 +ERROR_INPUTOUPUT=7 +ERROR_FREESPACE=8 +ERROR_INTEGRITY=9 +ERROR_MISSING_RESOURCES=10 +ERROR_JVM_EXTRACTION=11 +ERROR_JVM_UNPACKING=12 +ERROR_VERIFY_BUNDLED_JVM=13 + +VERIFY_OK=1 +VERIFY_NOJAVA=2 +VERIFY_UNCOMPATIBLE=3 + +MSG_ERROR_JVM_NOT_FOUND="nlu.jvm.notfoundmessage" +MSG_ERROR_USER_ERROR="nlu.jvm.usererror" +MSG_ERROR_JVM_UNCOMPATIBLE="nlu.jvm.uncompatible" +MSG_ERROR_INTEGRITY="nlu.integrity" +MSG_ERROR_FREESPACE="nlu.freespace" +MSG_ERROP_MISSING_RESOURCE="nlu.missing.external.resource" +MSG_ERROR_TMPDIR="nlu.cannot.create.tmpdir" + +MSG_ERROR_EXTRACT_JVM="nlu.cannot.extract.bundled.jvm" +MSG_ERROR_UNPACK_JVM_FILE="nlu.cannot.unpack.jvm.file" +MSG_ERROR_VERIFY_BUNDLED_JVM="nlu.error.verify.bundled.jvm" + +MSG_RUNNING="nlu.running" +MSG_STARTING="nlu.starting" +MSG_EXTRACTING="nlu.extracting" +MSG_PREPARE_JVM="nlu.prepare.jvm" +MSG_JVM_SEARCH="nlu.jvm.search" +MSG_ARG_JAVAHOME="nlu.arg.javahome" +MSG_ARG_VERBOSE="nlu.arg.verbose" +MSG_ARG_OUTPUT="nlu.arg.output" +MSG_ARG_EXTRACT="nlu.arg.extract" +MSG_ARG_TEMPDIR="nlu.arg.tempdir" +MSG_ARG_CPA="nlu.arg.cpa" +MSG_ARG_CPP="nlu.arg.cpp" +MSG_ARG_DISABLE_FREE_SPACE_CHECK="nlu.arg.disable.space.check" +MSG_ARG_LOCALE="nlu.arg.locale" +MSG_ARG_SILENT="nlu.arg.silent" +MSG_ARG_HELP="nlu.arg.help" +MSG_USAGE="nlu.msg.usage" + +isSymlink= + +entryPoint() { +initSymlinkArgument + CURRENT_DIRECTORY=`pwd` + LAUNCHER_NAME=`echo $0` + parseCommandLineArguments "$@" + initializeVariables + setLauncherLocale + debugLauncherArguments "$@" + if [ 1 -eq $SHOW_HELP_ONLY ] ; then + showHelp + fi + +message "$MSG_STARTING" +createTempDirectory + checkFreeSpace "$TOTAL_BUNDLED_FILES_SIZE" "$LAUNCHER_EXTRACT_DIR" + +extractJVMData + if [ 0 -eq $EXTRACT_ONLY ] ; then +searchJava + fi + + extractBundledData + verifyIntegrity + + if [ 0 -eq $EXTRACT_ONLY ] ; then + executeMainClass + else + exitProgram $ERROR_OK + fi +} + +initSymlinkArgument() { +testSymlinkErr=`test -L / 2>&1 > /dev/null` +if [ -z "$testSymlinkErr" ] ; then +isSymlink=-L +else +isSymlink=-h +fi +} + +debugLauncherArguments() { + debug "Launcher Command : $0" + argCounter=1 +while [ $# != 0 ] ; do + debug "... arg
svn commit: r38279 - /dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg
Author: arusinha Date: Tue Feb 25 06:11:44 2020 New Revision: 38279 Log: mac installer for Netbeans-11.3 Added: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg (with props) Added: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg == Binary file - no diff available. Propchange: dev/netbeans/netbeans/11.3/installers/Apache-NetBeans-11.3-bin-macosx.dmg -- svn:mime-type = application/octet-stream - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
svn commit: r38247 - /dev/netbeans/netbeans/11.3/installers/
Author: arusinha Date: Mon Feb 24 11:44:37 2020 New Revision: 38247 Log: creating folder for windows/mac/linux installers Added: dev/netbeans/netbeans/11.3/installers/ - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: [NETBEANS-3202] Fix issue in Text Block (#1570)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 4a21981 [NETBEANS-3202] Fix issue in Text Block (#1570) 4a21981 is described below commit 4a2198190e89ea41892491f7d4a516eb7f528e40 Author: Akshay-Gupta-Oracle <55184560+akshay-gupta-ora...@users.noreply.github.com> AuthorDate: Mon Dec 2 14:34:38 2019 +0530 [NETBEANS-3202] Fix issue in Text Block (#1570) * {Netbeans:3202] Fix issue in Text Block * [NETBEANS-3202] Fix issue in Text Block --- .../org/netbeans/modules/editor/java/JavaKit.java | 2 +- .../modules/editor/java/TypingCompletion.java | 7 .../editor/java/TypingCompletionUnitTest.java | 46 ++ 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/JavaKit.java b/java/java.editor/src/org/netbeans/modules/editor/java/JavaKit.java index 69a69c4..6281256 100644 --- a/java/java.editor/src/org/netbeans/modules/editor/java/JavaKit.java +++ b/java/java.editor/src/org/netbeans/modules/editor/java/JavaKit.java @@ -428,7 +428,7 @@ public class JavaKit extends NbEditorKit { public void insert(MutableContext context) throws BadLocationException { int dotPos = context.getCaretOffset(); Document doc = context.getDocument(); - +if(TypingCompletion.posWithinTextBlock(doc, dotPos))return; if (TypingCompletion.posWithinString(doc, dotPos)) { if (CodeStyle.getDefault(doc).wrapAfterBinaryOps()) { context.setText("\" +\n \"", 3, 6); // NOI18N diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/TypingCompletion.java b/java/java.editor/src/org/netbeans/modules/editor/java/TypingCompletion.java index f09bf49..d8867d0 100644 --- a/java/java.editor/src/org/netbeans/modules/editor/java/TypingCompletion.java +++ b/java/java.editor/src/org/netbeans/modules/editor/java/TypingCompletion.java @@ -547,6 +547,13 @@ class TypingCompletion { return posWithinQuotes(doc, caretOffset, JavaTokenId.STRING_LITERAL); } + static boolean posWithinTextBlock(Document doc, int caretOffset) { +TokenSequence javaTS=javaTokenSequence(doc,caretOffset, false); +if(javaTS == null)return false; +boolean movePrevious = javaTS.movePrevious(); +if(!movePrevious)return false; +return posWithinQuotes(doc, caretOffset, JavaTokenId.STRING_LITERAL) && javaTS.token().text().toString().equals("\"\""); +} private static boolean posWithinQuotes(Document doc, int caretOffset, JavaTokenId tokenId) { TokenSequence javaTS = javaTokenSequence(doc, caretOffset, false); if (javaTS != null) { diff --git a/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/TypingCompletionUnitTest.java b/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/TypingCompletionUnitTest.java index 14f1990..3518d95 100644 --- a/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/TypingCompletionUnitTest.java +++ b/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/TypingCompletionUnitTest.java @@ -966,6 +966,52 @@ public class TypingCompletionUnitTest extends NbTestCase { + "}\n"); } +public void testPositionInTextBlock() throws Exception { + try { +SourceVersion.valueOf("RELEASE_13"); +} catch (IllegalArgumentException ex) { +//OK, skip test +return ; +} +Context ctx = new Context(new JavaKit(), +"class Test {\n" ++ "{\n" ++ "\"\"\"|abcd\"\"\"\n" ++ "}\n" ++ "}\n"); +ctx.typeChar('\n'); +ctx.assertDocumentTextEquals( +"class Test {\n" ++ "{\n" ++ "\"\"\"\n" ++ "|abcd\"\"\"\n" ++ "}\n" ++ "}\n"); +} + + public void testPositionInEmptyTextBlock() throws Exception { + try { +SourceVersion.valueOf("RELEASE_13"); +} catch (IllegalArgumentException ex) { +//OK, skip test +return ; +} +Context ctx = new Context(new JavaKit(), +"class Test {\n" ++ "{\n" ++ "\"\"\"|\"\"\"\n" ++ &q
[netbeans] branch master updated: [NETBEANS-3096]:Updation for external nb-javac jar in libs.javacapi and libs.javaimpl modules with nb-javac jar for jdk-13 (#1506)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new ba9af0e [NETBEANS-3096]:Updation for external nb-javac jar in libs.javacapi and libs.javaimpl modules with nb-javac jar for jdk-13 (#1506) ba9af0e is described below commit ba9af0e3868646536a29b1ac77b5738ac63bddc6 Author: Arunava Sinha AuthorDate: Mon Sep 16 14:54:49 2019 +0530 [NETBEANS-3096]:Updation for external nb-javac jar in libs.javacapi and libs.javaimpl modules with nb-javac jar for jdk-13 (#1506) --- .../java/completion/JavaCompletionTask113FeaturesTest.java| 11 --- .../modules/java/source/nbjavac/parsing/TreeLoader.java | 4 +++- java/libs.javacapi/external/binaries-list | 2 +- ...b-javac-12-api-license.txt => nb-javac-13-api-license.txt} | 2 +- java/libs.javacapi/nbproject/org-netbeans-libs-javacapi.sig | 6 -- java/libs.javacapi/nbproject/project.xml | 2 +- java/libs.javacimpl/external/binaries-list| 2 +- ...javac-12-impl-license.txt => nb-javac-13-impl-license.txt} | 2 +- java/libs.javacimpl/nbproject/project.xml | 2 +- nbbuild/templates/projectized.xml | 2 +- 10 files changed, 22 insertions(+), 13 deletions(-) diff --git a/java/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask113FeaturesTest.java b/java/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask113FeaturesTest.java index 2c3758a..da74c2c 100644 --- a/java/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask113FeaturesTest.java +++ b/java/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask113FeaturesTest.java @@ -20,13 +20,15 @@ package org.netbeans.modules.java.completion; import javax.lang.model.SourceVersion; import org.netbeans.junit.NbTestSuite; - +import org.netbeans.modules.java.source.parsing.JavacParser; /** * * @author arusinha */ public class JavaCompletionTask113FeaturesTest extends CompletionTestBase { +private static String SOURCE_LEVEL = "1.13"; //NOI18N + public JavaCompletionTask113FeaturesTest(String testName) { super(testName); } @@ -44,14 +46,17 @@ public class JavaCompletionTask113FeaturesTest extends CompletionTestBase { } public void testSwitchExprAutoCompleteYieldValue() throws Exception { -performTest("SwitchExprForYieldWithValue", 1019, "yi", "SwitchExprYieldAutoCompletion.pass"); +performTest("SwitchExprForYieldWithValue", 1019, "yi", "SwitchExprYieldAutoCompletion.pass", SOURCE_LEVEL); } public void testSwitchExprAutoCompleteYieldValue2() throws Exception { -performTest("SwitchExprForYieldWithValue2", 1023, "yi", "SwitchExprYieldAutoCompletion.pass"); +performTest("SwitchExprForYieldWithValue2", 1023, "yi", "SwitchExprYieldAutoCompletion.pass", SOURCE_LEVEL); } public void noop() { } +static { +JavacParser.DISABLE_SOURCE_LEVEL_DOWNGRADE = true; +} } diff --git a/java/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/parsing/TreeLoader.java b/java/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/parsing/TreeLoader.java index 93b0c5a..63d3677 100644 --- a/java/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/parsing/TreeLoader.java +++ b/java/java.source.nbjavac/src/org/netbeans/modules/java/source/nbjavac/parsing/TreeLoader.java @@ -101,7 +101,9 @@ public class TreeLoader extends LazyTreeLoader { private static final ThreadLocal isTreeLoading = new ThreadLocal(); public static void preRegister(final Context context, final ClasspathInfo cpInfo, final boolean detached) { -context.put(lazyTreeLoaderKey, new TreeLoader(context, cpInfo, detached)); +LazyTreeLoader instance = context.get(lazyTreeLoaderKey); +if (instance == null) +context.put(lazyTreeLoaderKey, new TreeLoader(context, cpInfo, detached)); } public static TreeLoader instance (final Context ctx) { diff --git a/java/libs.javacapi/external/binaries-list b/java/libs.javacapi/external/binaries-list index f730817..b76e2e6 100644 --- a/java/libs.javacapi/external/binaries-list +++ b/java/libs.javacapi/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -9FA2C56C15D013C391EF76E9AA07172F20447673 nb-javac-12-api.jar +E6F49BAA176938C82F4EBAA148F8A8AB13556233 nb-javac-13-api.jar diff --git a/java/l
[netbeans] branch master updated: [NETBEANS-2349] Convert switch typecast case to switch expression (#1237)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new dfa1107 [NETBEANS-2349] Convert switch typecast case to switch expression (#1237) dfa1107 is described below commit dfa11078c6edcc82d999d797fc1c9648a7d114ce Author: Vikas Prabhakar AuthorDate: Sun Sep 15 18:00:26 2019 +0530 [NETBEANS-2349] Convert switch typecast case to switch expression (#1237) --- .../modules/java/hints/errors/Utilities.java | 59 +- .../java/hints/jdk/ConvertSwitchToRuleSwitch.java | 6 +- .../hints/jdk/ConvertSwitchToRuleSwitchTest.java | 94 ++ 3 files changed, 135 insertions(+), 24 deletions(-) diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java b/java/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java index b436b55..9b8f8f9 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java +++ b/java/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java @@ -122,7 +122,6 @@ import org.openide.NotifyDescriptor; import org.openide.filesystems.FileObject; import org.openide.text.NbDocument; import org.openide.util.Exceptions; - import static com.sun.source.tree.Tree.Kind.*; import com.sun.source.tree.UnaryTree; import com.sun.source.util.TreePathScanner; @@ -137,7 +136,6 @@ import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.util.JCDiagnostic; import com.sun.tools.javac.util.Log; import java.net.URI; -import java.util.concurrent.Callable; import javax.lang.model.element.NestingKind; import javax.lang.model.type.ErrorType; import javax.lang.model.type.UnionType; @@ -161,6 +159,7 @@ import org.openide.util.Pair; public class Utilities { public static final String JAVA_MIME_TYPE = "text/x-java"; private static final String DEFAULT_NAME = "name"; +enum SWITCH_TYPE { TRADITIONAL_SWITCH, RULE_SWITCH, SWITCH_EXPRESSION } public Utilities() { } @@ -3167,18 +3166,20 @@ public class Utilities { return true; } -public static void performRewriteRuleSwitch(JavaFix.TransformationContext ctx, TreePath tp, Tree st, boolean isExpression) { +public static void performRewriteRuleSwitch(JavaFix.TransformationContext ctx, TreePath tp, Tree st, boolean isSwitchExpression) { WorkingCopy wc = ctx.getWorkingCopy(); TreeMaker make = wc.getTreeMaker(); List newCases = new ArrayList<>(); +SWITCH_TYPE switchType = SWITCH_TYPE.TRADITIONAL_SWITCH; +Tree typeCastTree = null; List cases; Set variablesDeclaredInOtherCases = new HashSet<>(); List patterns = new ArrayList<>(); -Tree variable = null; -boolean isReturnExpression = false; -boolean switchExpressionFlag = st.getKind().toString().equals(TreeShims.SWITCH_EXPRESSION); -if (switchExpressionFlag) { +Tree leftVariable = null; +boolean ruleSwitchFlag = st.getKind().toString().equals(TreeShims.SWITCH_EXPRESSION); +if (ruleSwitchFlag) { cases = TreeShims.getCases(st); +switchType = SWITCH_TYPE.RULE_SWITCH; } else { cases = ((SwitchTree) st).getCases(); } @@ -3197,7 +3198,7 @@ public class Utilities { continue; } //last case, no break -} else if (!switchExpressionFlag && statements.get(statements.size() - 1).getKind() == Tree.Kind.BREAK +} else if (!ruleSwitchFlag && statements.get(statements.size() - 1).getKind() == Tree.Kind.BREAK && ctx.getWorkingCopy().getTreeUtilities().getBreakContinueTarget(new TreePath(new TreePath(tp, ct), statements.get(statements.size() - 1))) == st) { statements.remove(statements.size() - 1); } else { @@ -3259,15 +3260,19 @@ public class Utilities { body = statements.get(0); } } -if (isExpression) { +if (isSwitchExpression) { +switchType = SWITCH_TYPE.SWITCH_EXPRESSION; if (statements.get(0).getKind() == Tree.Kind.RETURN) { body = ((JCTree.JCReturn) statements.get(0)).getExpression(); -isReturnExpression = true; } else { JCTree.JCExpressionStatement jceTree = (JCTree.JCExpressionStatement) statements.get(0); body = ((JCTree.JCAssign) jceTree.expr).rhs; -variable = ((JCTree.JCAssign) jceTree.expr).lhs; +leftVariable = ((JCTree.JCAssign) jceTree.expr).lhs; } +if (body.getKind() == Tree.Kind.TYPE_CAST) { +
[netbeans] branch master updated: [NETBEANS-3097]:Changed font color type name for text-block(JDK-13) (#1498)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 511b1a3 [NETBEANS-3097]:Changed font color type name for text-block(JDK-13) (#1498) 511b1a3 is described below commit 511b1a3299fa3ce77565e5c122f369d2ff42422c Author: Arunava Sinha AuthorDate: Fri Sep 13 20:11:00 2019 +0530 [NETBEANS-3097]:Changed font color type name for text-block(JDK-13) (#1498) --- .../src/org/netbeans/modules/java/editor/resources/fontsColors.xml | 2 +- .../src/org/netbeans/modules/java/editor/semantic/ColoringManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/resources/fontsColors.xml b/java/java.editor/src/org/netbeans/modules/java/editor/resources/fontsColors.xml index 668ecb7..4f9c647 100644 --- a/java/java.editor/src/org/netbeans/modules/java/editor/resources/fontsColors.xml +++ b/java/java.editor/src/org/netbeans/modules/java/editor/resources/fontsColors.xml @@ -87,7 +87,7 @@ - +
[netbeans] branch master updated: [NETBEANS-2917]: Support for yield in Switch-Expression for JDK-13 (#1409)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 3ddcdc4 [NETBEANS-2917]: Support for yield in Switch-Expression for JDK-13 (#1409) 3ddcdc4 is described below commit 3ddcdc4d242293353d5a320d837759e8413644dd Author: Arunava Sinha AuthorDate: Tue Aug 27 17:12:34 2019 +0530 [NETBEANS-2917]: Support for yield in Switch-Expression for JDK-13 (#1409) * Adding support for yield. * Adding forgotten test API. * [NETBEANS-2917]: AutoCompletion of Yield keyword inside Switch Expression for JDK-13 * [NETBEANS-2917]: Corrected formatting for Switch Expression using yield with value * [NETBEANS-2917]: Added autocomplete for Switch-Expr Yield keyword inside Block * [NETBEANS-2917]: Modified Test-Cases for supporting Yield with value inside Switch Expression * [NETBEANS-2917]: Refactored code for Yield Support in Switch Expression * [NETBEANS-2917]:Syncing golden file with master --- .../java/completion/JavaCompletionTask.java| 49 --- .../1.8/SwitchExprYieldAutoCompletion.pass | 1 + .../10/SwitchExprYieldAutoCompletion.pass | 1 + .../11/SwitchExprYieldAutoCompletion.pass | 1 + .../12/SwitchExprYieldAutoCompletion.pass | 1 + .../13/SwitchExprYieldAutoCompletion.pass | 1 + .../13/ruleSwitchAutoCompleteCaseValues.pass | 1 + .../13/ruleSwitchEnumCaseValues.pass | 1 + .../13/switchEnumCaseValues.pass | 3 ++ .../13/switchEnumCaseValues2.pass | 2 + .../13/switchExprEnumCaseValues.pass | 2 + .../data/SwitchExprForYieldWithValue.java | 35 + .../data/SwitchExprForYieldWithValue2.java | 36 ++ .../JavaCompletionTask113FeaturesTest.java | 57 ++ .../base/semantic/SemanticHighlighterBase.java | 13 - .../java/editor/base/semantic/DetectorTest.java| 15 ++ .../java/editor/base/semantic/HighlightImpl.java | 3 ++ .../java/editor/base/semantic/TestBase.java| 35 - .../hints/errors/DifferentCaseKindsFixTest.java| 44 - .../org/netbeans/api/java/source/WorkingCopy.java | 6 +++ .../netbeans/modules/java/source/TreeShims.java| 16 ++ .../modules/java/source/pretty/VeryPretty.java | 17 ++- .../modules/java/source/save/Reformatter.java | 25 -- .../api/java/source/gen/SwitchExpressionTest.java | 10 ++-- .../modules/java/source/save/FormatingTest.java| 36 +++--- .../modules/java/source/save/ReindenterTest.java | 16 +++--- 26 files changed, 361 insertions(+), 66 deletions(-) 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 fb901e3..2722cf0 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 @@ -198,7 +198,8 @@ public final class JavaCompletionTask extends BaseTask { private static final String VOLATILE_KEYWORD = "volatile"; //NOI18N private static final String WHILE_KEYWORD = "while"; //NOI18N private static final String WITH_KEYWORD = "with"; //NOI18N - +private static final String YIELD_KEYWORD = "yield"; //NOI18N + private static final String JAVA_LANG_CLASS = "java.lang.Class"; //NOI18N private static final String JAVA_LANG_OBJECT = "java.lang.Object"; //NOI18N private static final String JAVA_LANG_ITERABLE = "java.lang.Iterable"; //NOI18N @@ -235,9 +236,10 @@ public final class JavaCompletionTask extends BaseTask { private static final SourceVersion SOURCE_VERSION_RELEASE_10; private static final SourceVersion SOURCE_VERSION_RELEASE_11; +private static final SourceVersion SOURCE_VERSION_RELEASE_13; static { -SourceVersion r10, r11; +SourceVersion r10, r11, r13; try { r10 = SourceVersion.valueOf("RELEASE_10"); @@ -249,9 +251,15 @@ public final class JavaCompletionTask extends BaseTask { } catch (IllegalArgumentException ex) { r11 = null; } +try { +r13 = SourceVersion.valueOf("RELEASE_13"); +} catch (IllegalArgumentException ex) { +r13 = null; +} SOURCE_VERSION_RELEASE_10 = r10; SOURCE_VERSION_RELEASE_11 = r11; +SOURCE_VERSION_RELEASE_13 = r13; } private final ItemFactory itemFactory; @@ -491,6 +499,11 @@
[netbeans] branch master updated: [NETBEANS-2609]:Provided support to build NB IDE specific to Java cluster (#1268)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 94e5769 [NETBEANS-2609]:Provided support to build NB IDE specific to Java cluster (#1268) 94e5769 is described below commit 94e5769d5e3f0df547cb3b25bf32b5dc3289ddc3 Author: Arunava Sinha AuthorDate: Mon Jun 3 22:46:20 2019 +0530 [NETBEANS-2609]:Provided support to build NB IDE specific to Java cluster (#1268) * [NETBEANS-2609]:Provided support to build NB IDE specific to Java cluster * [NETBEANS-2609]:Corrected projectName in buildFile * [NETBEANS-2609]: Used Basic cluster to build IDE specific to java * [NETBEANS-2609]: Altered travis configuration for build-basic --- .travis.yml | 3 +++ java/build.xml| 30 ++ nbbuild/build.xml | 18 ++ 3 files changed, 51 insertions(+) diff --git a/.travis.yml b/.travis.yml index d6c125c..d0fd369 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,6 +51,9 @@ matrix: - env: OPTS="-quiet" TARGET="build-platform" jdk: oraclejdk11 +- env: OPTS="-quiet -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false" TARGET="build-basic" + jdk: oraclejdk8 + - env: OPTS="-Dcluster.config=standard -quiet -Dpermit.jdk9.builds=true -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false" TARGET="build" jdk: oraclejdk11 diff --git a/java/build.xml b/java/build.xml new file mode 100644 index 000..174cdc1 --- /dev/null +++ b/java/build.xml @@ -0,0 +1,30 @@ + + + +NetBeans Basic cluster build script. + + + + + + + diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 7c03de8..83f7e95 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -470,6 +470,24 @@ Hg ID:${hg.id} + + + + + + + + + + + + + + + + + + - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: [NETBEANS-2448] Add jdk 10, 12 migrate configs under Inspect and Transform (#1212)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 4f85b23 [NETBEANS-2448] Add jdk 10, 12 migrate configs under Inspect and Transform (#1212) 4f85b23 is described below commit 4f85b238cf70f0f6828e59de735b1b027ff8b03e Author: Reema Taneja <32299405+rtane...@users.noreply.github.com> AuthorDate: Thu May 2 15:10:10 2019 +0530 [NETBEANS-2448] Add jdk 10, 12 migrate configs under Inspect and Transform (#1212) * add jdk-12 migrate config * [NETBEANS-2448] JDK 10, 12 syntax migration support * corrected code formatting --- .../spiimpl/refactoring/ConfigurationsManager.java | 31 +- .../modules/java/hints/resources/jdk10.properties | 17 .../modules/java/hints/resources/jdk12.properties | 17 .../modules/java/hints/resources/layer.xml | 29 4 files changed, 93 insertions(+), 1 deletion(-) diff --git a/java/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/ConfigurationsManager.java b/java/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/ConfigurationsManager.java index 8553662..2fff3fa 100644 --- a/java/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/ConfigurationsManager.java +++ b/java/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/ConfigurationsManager.java @@ -19,10 +19,14 @@ package org.netbeans.modules.java.hints.spiimpl.refactoring; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.prefs.BackingStoreException; import java.util.prefs.Preferences; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.swing.event.ChangeListener; import org.openide.util.ChangeSupport; import org.openide.util.Exceptions; @@ -75,7 +79,32 @@ public class ConfigurationsManager { private void init() { Preferences prefs = NbPreferences.forModule(this.getClass()); try { -for (String kid:prefs.childrenNames()) { +String[] configList = prefs.childrenNames(); +//fix sorting for JDK migrators +List sl = Arrays.asList(configList); +final String exp = "([0-9]+)$"; //NOI18N + +sl.sort(new Comparator() { +@Override +public int compare(String s1, String s2) { +Pattern pattern = Pattern.compile(exp); +Matcher m1 = pattern.matcher(s1); +if (m1.find()) { +Matcher m2 = pattern.matcher(s2); +if (m2.find()) { +String part_s1 = s1.substring(0, m1.start()); +String part_s2 = s2.substring(0, m2.start()); +if (part_s1.equals(part_s2)) { +int val1 = Integer.parseInt(m1.group()); +int val2 = Integer.parseInt(m2.group()); +return val1 - val2; +} +} +} +return s1.compareTo(s2); +} +}); +for (String kid : sl.toArray(configList)) { if (kid.startsWith(RULE_PREFIX)) { Preferences p = NbPreferences.forModule(this.getClass()).node(kid); String displayName = p.get("display.name", "unknown"); diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/resources/jdk10.properties b/java/java.hints/src/org/netbeans/modules/java/hints/resources/jdk10.properties new file mode 100644 index 000..36e5ce4 --- /dev/null +++ b/java/java.hints/src/org/netbeans/modules/java/hints/resources/jdk10.properties @@ -0,0 +1,17 @@ +# 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. +display.name=Migrate to JDK 10 diff --git a/java/java.h
[netbeans] branch master updated: [NETBEANS-2350]NPE while doing auto complete in rule switch block
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new a2af32d [NETBEANS-2350]NPE while doing auto complete in rule switch block new 3c8e4f4 Merge pull request #1211 from vikasprabhakar/NPE_Switch_expression a2af32d is described below commit a2af32da3af7e818b86bba234aa45639d3ed4ca2 Author: Vikas Prabhakar AuthorDate: Mon Apr 22 21:49:36 2019 -0700 [NETBEANS-2350]NPE while doing auto complete in rule switch block --- .../java/completion/JavaCompletionTask.java| 9 +- .../1.7/ruleSwitchAutoCompleteCaseValues.pass | 2 ++ .../1.8/ruleSwitchAutoCompleteCaseValues.pass | 1 + .../10/ruleSwitchAutoCompleteCaseValues.pass | 1 + .../11/ruleSwitchAutoCompleteCaseValues.pass | 1 + .../12/ruleSwitchAutoCompleteCaseValues.pass | 1 + .../data/RuleSwitchAutoCompleteCaseValue.java | 33 ++ .../JavaCompletionTask112FeaturesTest.java | 4 +++ 8 files changed, 51 insertions(+), 1 deletion(-) 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 8e925dc..ddfd78a 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 @@ -2293,7 +2293,14 @@ public final class JavaCompletionTask extends BaseTask { } if (lastCase != null) { StatementTree last = null; -for (StatementTree stat : lastCase.getStatements()) { +List statements = lastCase.getStatements(); +if (statements == null) { +Tree caseBody = TreeShims.getBody(lastCase); +if (caseBody instanceof StatementTree) { +statements = Collections.singletonList((StatementTree) caseBody); +} +} +for (StatementTree stat : statements) { int pos = (int) sourcePositions.getStartPosition(root, stat); if (pos == Diagnostic.NOPOS || offset <= pos) { break; diff --git a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.7/ruleSwitchAutoCompleteCaseValues.pass b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.7/ruleSwitchAutoCompleteCaseValues.pass new file mode 100644 index 000..9ce5b19 --- /dev/null +++ b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.7/ruleSwitchAutoCompleteCaseValues.pass @@ -0,0 +1,2 @@ +case + diff --git a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/ruleSwitchAutoCompleteCaseValues.pass b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/ruleSwitchAutoCompleteCaseValues.pass new file mode 100644 index 000..9a33383 --- /dev/null +++ b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/ruleSwitchAutoCompleteCaseValues.pass @@ -0,0 +1 @@ +case diff --git a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/ruleSwitchAutoCompleteCaseValues.pass b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/ruleSwitchAutoCompleteCaseValues.pass new file mode 100644 index 000..9a33383 --- /dev/null +++ b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/ruleSwitchAutoCompleteCaseValues.pass @@ -0,0 +1 @@ +case diff --git a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/ruleSwitchAutoCompleteCaseValues.pass b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/ruleSwitchAutoCompleteCaseValues.pass new file mode 100644 index 000..9a33383 --- /dev/null +++ b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/ruleSwitchAutoCompleteCaseValues.pass @@ -0,0 +1 @@ +case diff --git a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/12/ruleSwitchAutoCompleteCaseValues.pass b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/12/ruleSwitchAutoCompleteCaseValues.pass new file mode 100
[netbeans] branch master updated: [NETBEANS-2349] Convert switch to switch expression (#1193)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new ac510a0 [NETBEANS-2349] Convert switch to switch expression (#1193) ac510a0 is described below commit ac510a00be35b5c04054a14b9394f5419c3ca7c4 Author: Vikas Prabhakar AuthorDate: Thu May 2 11:03:59 2019 +0530 [NETBEANS-2349] Convert switch to switch expression (#1193) * [NETBEANS-2349] Convert switch to switch expression * [NETBEANS-2349] Add return scenario * Format correction * [NETBEANS-2349] Implement review feedbacks * [NETBEANS-2349] replace SWITCH_EXPRESSION strings to variable TreeShims.SWITCH_EXPRESSION --- .../java/completion/JavaCompletionTask.java| 4 +- .../java/hints/errors/DifferentCaseKindsFix.java | 4 +- .../modules/java/hints/errors/Utilities.java | 72 +- .../java/hints/jdk/ConvertSwitchToRuleSwitch.java | 33 ++- .../hints/jdk/ConvertSwitchToRuleSwitchTest.java | 247 - .../org/netbeans/api/java/source/WorkingCopy.java | 3 +- .../netbeans/modules/java/source/TreeShims.java| 5 +- .../modules/java/source/pretty/VeryPretty.java | 49 +++- .../modules/java/source/save/CasualDiff.java | 2 +- .../modules/java/source/save/Reformatter.java | 6 +- .../modules/java/source/save/Reindenter.java | 2 +- .../api/java/source/gen/SwitchExpressionTest.java | 3 +- .../modules/java/hints/spiimpl/Utilities.java | 11 +- 13 files changed, 399 insertions(+), 42 deletions(-) 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 8e925dc..5d2966d 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 @@ -2354,7 +2354,7 @@ public final class JavaCompletionTask extends BaseTask { if (caseExpressionTree != null && ((sourcePositions.getStartPosition(root, caseExpressionTree) >= offset) || (caseErroneousTree != null && caseErroneousTree.getKind() == Tree.Kind.ERRONEOUS && ((ErroneousTree) caseErroneousTree).getErrorTrees().isEmpty() && sourcePositions.getEndPosition(root, caseErroneousTree) >= offset))) { -if (parentPath.getLeaf().getKind() == Tree.Kind.SWITCH || parentPath.getLeaf().getKind().toString().equals("SWITCH_EXPRESSION")) { //NOI18N +if (parentPath.getLeaf().getKind() == Tree.Kind.SWITCH || parentPath.getLeaf().getKind().toString().equals(TreeShims.SWITCH_EXPRESSION)) { ExpressionTree exprTree = null; if (parentPath.getLeaf().getKind() == Tree.Kind.SWITCH) { exprTree = ((SwitchTree) parentPath.getLeaf()).getExpression(); @@ -3707,7 +3707,7 @@ public final class JavaCompletionTask extends BaseTask { if (path != null && path.getLeaf().getKind() == Tree.Kind.SWITCH) { SwitchTree st = (SwitchTree) path.getLeaf(); caseTrees = st.getCases(); -} else if (path != null && path.getLeaf().getKind().toString().equals("SWITCH_EXPRESSION")) { //NOI18N +} else if (path != null && path.getLeaf().getKind().toString().equals(TreeShims.SWITCH_EXPRESSION)) { caseTrees = TreeShims.getCases(path.getLeaf()); } diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/errors/DifferentCaseKindsFix.java b/java/java.hints/src/org/netbeans/modules/java/hints/errors/DifferentCaseKindsFix.java index c91f65e1..ec75b07 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/errors/DifferentCaseKindsFix.java +++ b/java/java.hints/src/org/netbeans/modules/java/hints/errors/DifferentCaseKindsFix.java @@ -60,7 +60,7 @@ public class DifferentCaseKindsFix implements ErrorRule { TreePath parentPath = treePath.getParentPath(); List caseTrees = null; boolean flag = false; - if(parentPath.getLeaf().getKind().toString().equals("SWITCH_EXPRESSION")){ + if(parentPath.getLeaf().getKind().toString().equals(TreeShims.SWITCH_EXPRESSION)){ caseTrees = TreeShims.getCases(parentPath.getLeaf()); } else { flag = true; @@ -135,7 +135,7 @@ public class DifferentCaseKindsFix implements ErrorRule { protected void performRewrite(TransformationContext ctx) { TreePath tp = ctx.getPath(); Tree switchBlock = tp.getParentPath().getLeaf(); -Utilities.performRewriteRuleSwitch(ctx, tp, switchBlock); +Utilities.performRewriteRuleSwitch(ctx,
[incubator-netbeans] branch master updated (a50d777 -> 057eee2)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git. from a50d777 Ensuring important DTDs are used locally when running java.completion… (#1206) new 248e96f [NETBEANS-2284]: Changes for builing NB with JDK11 new 1c49043 Merge remote-tracking branch 'upstream/master' into compile_check_with_jdk11 new 057eee2 Merge pull request #1144 from vikasprabhakar/compile_check_with_jdk11 The 2488 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .travis.yml| 3 + apisupport/apisupport.ant/build.xml| 2 +- enterprise/glassfish.tooling/nbproject/project.xml | 9 + enterprise/j2ee.ant/build.xml | 2 +- enterprise/j2ee.dd/nbproject/project.properties| 1 + enterprise/j2ee.dd/nbproject/project.xml | 4 + enterprise/web.beans/nbproject/project.xml | 8 + enterprise/web.jspparser/build.xml | 2 +- enterprise/web.monitor/build.xml | 2 +- enterprise/web.project/build.xml | 2 +- enterprise/websvc.manager/nbproject/project.xml| 9 + .../netbeans/test/ide/CountingSecurityManager.java | 5 +- java/debugger.jpda.visual/build.xml| 2 +- java/form/build.xml| 2 +- .../nbproject/project.properties | 3 +- java/java.j2seembedded/build.xml | 2 +- java/java.j2seplatform/build.xml | 2 +- .../modules/java/source/NoJavacHelper.java | 45 ++- .../netbeans/lib/jshell/agent/LoaderDelegator.java | 3 + .../build.xml | 22 +- .../external/binaries-list}| 5 +- .../glassfish-corba-omgapi-4.1.0-license.txt | 405 + java/libs.corba.omgapi/manifest.mf | 6 + .../nbproject/project.properties | 8 +- java/libs.corba.omgapi/nbproject/project.xml | 77 .../netbeans/libs/corba/omgapi/Bundle.properties} | 6 +- .../org/netbeans/modules/maven/indexer/OnStop.java | 2 +- java/maven/build.xml | 4 +- .../test/ide/PerfCountingSecurityManager.java | 5 +- java/testng.maven/nbproject/project.properties | 1 - java/testng/nbproject/project.properties | 1 - java/whitelist/nbproject/project.xml | 8 + java/xml.tools.java/nbproject/project.properties | 1 - nbbuild/build.xml | 2 +- nbbuild/cluster.properties | 1 + profiler/lib.profiler/build.xml| 18 +- 36 files changed, 614 insertions(+), 66 deletions(-) copy java/{java.j2seplatform => libs.corba.omgapi}/build.xml (57%) copy java/{xml.tools.java/nbproject/project.properties => libs.corba.omgapi/external/binaries-list} (87%) create mode 100644 java/libs.corba.omgapi/external/glassfish-corba-omgapi-4.1.0-license.txt create mode 100644 java/libs.corba.omgapi/manifest.mf copy java/{testng.maven => libs.corba.omgapi}/nbproject/project.properties (83%) create mode 100644 java/libs.corba.omgapi/nbproject/project.xml copy java/{xml.tools.java/nbproject/project.properties => libs.corba.omgapi/src/org/netbeans/libs/corba/omgapi/Bundle.properties} (87%) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[incubator-netbeans] branch master updated: [NETBEANS-2315] Switch expression multi cases should have Enum values in auto complete options
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git The following commit(s) were added to refs/heads/master by this push: new 68f21ee [NETBEANS-2315] Switch expression multi cases should have Enum values in auto complete options new 8fb84ee Merge pull request #1175 from vikasprabhakar/auto_complete_switch_expression 68f21ee is described below commit 68f21eeda6ffdc32f7dbab5fd27f15304ffbb0a3 Author: Vikas Prabhakar AuthorDate: Tue Mar 26 04:17:44 2019 -0700 [NETBEANS-2315] Switch expression multi cases should have Enum values in auto complete options --- .../java/completion/JavaCompletionTask.java| 43 -- .../1.7/ruleSwitchEnumCaseValues.pass | 1 + .../1.7/switchExprEnumCaseValues.pass | 2 + .../1.8/ruleSwitchEnumCaseValues.pass | 1 + .../1.8/switchExprEnumCaseValues.pass | 2 + .../10/ruleSwitchEnumCaseValues.pass | 1 + .../10/switchExprEnumCaseValues.pass | 2 + .../11/ruleSwitchEnumCaseValues.pass | 1 + .../11/switchExprEnumCaseValues.pass | 2 + .../12/ruleSwitchEnumCaseValues.pass | 1 + .../12/switchExprEnumCaseValues.pass | 2 + .../data/RuleSwitchWithMultiEnumValues.java| 34 + .../data/SwitchExprWithMultiEnumValues.java| 33 + .../data/SwitchStatementWithMultiEnumValues.java | 33 + .../JavaCompletionTask112FeaturesTest.java | 12 ++ 15 files changed, 159 insertions(+), 11 deletions(-) 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 aa0b898..8e925dc 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 @@ -2334,20 +2334,37 @@ public final class JavaCompletionTask extends BaseTask { SourcePositions sourcePositions = env.getSourcePositions(); CompilationUnitTree root = env.getRoot(); CompilationController controller = env.getController(); -if (cst.getExpression() != null && ((sourcePositions.getStartPosition(root, cst.getExpression()) >= offset) -|| (cst.getExpression().getKind() == Tree.Kind.ERRONEOUS && ((ErroneousTree) cst.getExpression()).getErrorTrees().isEmpty() && sourcePositions.getEndPosition(root, cst.getExpression()) >= offset))) { -TreePath path1 = path.getParentPath(); -if (path1.getLeaf().getKind() == Tree.Kind.SWITCH || path1.getLeaf().getKind().toString().equals("SWITCH_EXPRESSION")) { //NOI18N +TreePath parentPath = path.getParentPath(); +ExpressionTree caseExpressionTree = null; +ExpressionTree caseErroneousTree = null; +List caseTreeList = TreeShims.getExpressions(cst); +if (!caseTreeList.isEmpty() && caseTreeList.size() == 1) { +caseExpressionTree = caseTreeList.get(0); +caseErroneousTree = caseTreeList.get(0); +} else if (caseTreeList.size() > 1) { +caseExpressionTree = caseTreeList.get(0); +for (ExpressionTree et : caseTreeList) { +if (et != null && et.getKind() == Tree.Kind.ERRONEOUS) { +caseErroneousTree = et; +break; +} +} +} + +if (caseExpressionTree != null && ((sourcePositions.getStartPosition(root, caseExpressionTree) >= offset) +|| (caseErroneousTree != null && caseErroneousTree.getKind() == Tree.Kind.ERRONEOUS && ((ErroneousTree) caseErroneousTree).getErrorTrees().isEmpty() && sourcePositions.getEndPosition(root, caseErroneousTree) >= offset))) { + +if (parentPath.getLeaf().getKind() == Tree.Kind.SWITCH || parentPath.getLeaf().getKind().toString().equals("SWITCH_EXPRESSION")) { //NOI18N ExpressionTree exprTree = null; -if (path1.getLeaf().getKind() == Tree.Kind.SWITCH) { -exprTree = ((SwitchTree) path1.getLeaf()).getExpression(); +if (parentPath.getLeaf().getKind() == Tree.Kind.SWITCH) { +exprTree = ((SwitchTree) parentPath.getLeaf()).getExpression(); } else { -List exprTrees = TreeShims.getExpressions(path1.getLeaf()); +List exprTrees = TreeShims.getExpressions(parentPath.getLeaf()); if (!exprTrees.isEmpty()) { exprTree = exprTrees.get(0); }
[incubator-netbeans] branch master updated: [NETBEANS-1251] nb-javac 11 testcase failure : Compound var declaration
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git The following commit(s) were added to refs/heads/master by this push: new bf3927d [NETBEANS-1251] nb-javac 11 testcase failure : Compound var declaration new 2d76c29 Merge pull request #1131 from vikasprabhakar/netbeans-1251 bf3927d is described below commit bf3927d1cab680a5cbc7eaa1c3f6091b4024f00c Author: Vikas Prabhakar AuthorDate: Tue Feb 12 02:49:29 2019 -0800 [NETBEANS-1251] nb-javac 11 testcase failure : Compound var declaration --- .../java/hints/errors/VarCompDeclaration.java | 4 .../java/hints/errors/VarCompDeclarationTest.java | 24 -- .../hints/infrastructure/ErrorHintsTestBase.java | 3 ++- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/errors/VarCompDeclaration.java b/java/java.hints/src/org/netbeans/modules/java/hints/errors/VarCompDeclaration.java index 9706480..aa7170b 100644 --- a/java/java.hints/src/org/netbeans/modules/java/hints/errors/VarCompDeclaration.java +++ b/java/java.hints/src/org/netbeans/modules/java/hints/errors/VarCompDeclaration.java @@ -123,6 +123,10 @@ public class VarCompDeclaration implements ErrorRule { int pos = statements.indexOf(statementPath.getLeaf()); List newStatements = new ArrayList<>(); if (pos > 0) { + if(info.getTreeUtilities().isPartOfCompoundVariableDeclaration(statements.get(pos - 1)) +&& !info.getTreeUtilities().isEndOfCompoundVariableDeclaration(statements.get(pos - 1))){ +pos--; +} newStatements.addAll(statements.subList(0, pos)); } diff --git a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/VarCompDeclarationTest.java b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/VarCompDeclarationTest.java index 6851b7d..a882087 100644 --- a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/VarCompDeclarationTest.java +++ b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/VarCompDeclarationTest.java @@ -68,7 +68,7 @@ public class VarCompDeclarationTest extends ErrorHintsTestBase { "package test; \n" + "public class Test {\n" + "private void test() { \n" + - "var v = 1, /*comment*/ v1 = 10;\n" + + "var v = 1, v1 = 10, v2 = 100;\n" + "} \n" + "}", -1, @@ -76,8 +76,9 @@ public class VarCompDeclarationTest extends ErrorHintsTestBase { ("package test; \n" + "public class Test {\n" + "private void test() { \n" + - "var v = 1; /*comment*/ \n" + + "var v = 1;\n" + "var v1 = 10;\n" + + "var v2 = 100;\n" + "} \n" + "}").replaceAll("[\\s]+", " ")); } @@ -259,6 +260,25 @@ public class VarCompDeclarationTest extends ErrorHintsTestBase { "}").replaceAll("[\\s]+", " ")); } +public void testCase11() throws Exception { +performFixTest("test/Test.java", + "package test; \n" + + "public class Test {\n" + + "private void test() { \n" + + "var v = {1, 2}, w = 2;\n" + + "} \n" + + "}", + -1, + NbBundle.getMessage(VarCompDeclarationTest.class, "FIX_VarCompDeclaration"), + ("package test; \n" + + "public class Test {\n" + + "private void test() { \n" + + "var v = {1, 2};\n" + + "var w = 2;\n" + + "} \n" + + "}").replaceAll("[\\s]+", " ")); +} + @Override protected List computeFixes(CompilationInfo info, int pos, TreePath path) throws Exception { return new VarCompDeclaration().run(info, null, pos, path, null); diff --git a/java/java.hints/test/unit/src/
[incubator-netbeans] branch master updated (fccdbb2 -> d96f2d2)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git. from fccdbb2 Merge pull request #1124 from arusinha/netbeans-1969 new 9eb25c5 [NETBEANS-1673]:Added support for auto-complete of enum case values in switch expression new d07ebab [NETBEANS-1673]:Added support for auto-complete of enum case values in switch expression new bd6a0b3 Merge remote-tracking branch 'upstream/master' into netbeans-1673 new cc3be0e [NETBEANS-1673]: Added test-cases for auto-completion of enum switch-expr case values new 2769496 Merge branch 'master' into netbeans-1673 new 9e6cd06 Update TreeShims.java new d96f2d2 Merge pull request #1059 from arusinha/netbeans-1673 The 2370 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/completion/JavaCompletionTask.java| 24 ++-- .../1.8/switchEnumCaseValues.pass | 3 + .../1.8/switchEnumCaseValues2.pass | 2 + .../10/switchEnumCaseValues.pass | 3 + .../10/switchEnumCaseValues2.pass | 2 + .../11/switchEnumCaseValues.pass | 3 + .../11/switchEnumCaseValues2.pass | 2 + .../12/switchEnumCaseValues.pass | 3 + .../12/switchEnumCaseValues2.pass | 2 + .../completion/data/RuleSwitchWithEnumValues.java | 33 +++ .../completion/data/SwitchExprWithEnumValues.java | 33 +++ .../completion/data/SwitchExprWithEnumValues2.java | 34 +++ .../java/completion/data/SwitchWithEnumValues.java | 33 +++ .../JavaCompletionTask112FeaturesTest.java | 67 ++ 14 files changed, 240 insertions(+), 4 deletions(-) create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/switchEnumCaseValues.pass create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/switchEnumCaseValues2.pass create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/switchEnumCaseValues.pass create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/switchEnumCaseValues2.pass create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/switchEnumCaseValues.pass create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/switchEnumCaseValues2.pass create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/12/switchEnumCaseValues.pass create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/12/switchEnumCaseValues2.pass create mode 100644 java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/RuleSwitchWithEnumValues.java create mode 100644 java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SwitchExprWithEnumValues.java create mode 100644 java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SwitchExprWithEnumValues2.java create mode 100644 java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/SwitchWithEnumValues.java create mode 100644 java/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask112FeaturesTest.java - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[incubator-netbeans] branch master updated (dfb33df -> fccdbb2)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git. from dfb33df [NETBEANS-2066] Update pluginimporter and upgrader tool to look for NetBeans 10.0 new 08df3b5 [NETBEANS-1969]:Fixed reindentation issues for Switch Rule-Case and Switch Expression(JDK-12) new 109496b Merge remote-tracking branch 'upstream/master' into netbeans-1969 new 626eb5d [NETBEANS-1969]: Refactored code and added test-cases for reindentation issue in Switch Expression/Switch Rule new fccdbb2 Merge pull request #1124 from arusinha/netbeans-1969 The 2363 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../netbeans/modules/java/source/TreeShims.java| 62 .../modules/java/source/save/Reindenter.java | 167 + .../modules/java/source/save/ReindenterTest.java | 148 ++ 3 files changed, 316 insertions(+), 61 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[incubator-netbeans] branch master updated (1e18daf -> fb44c5f)
This is an automated email from the ASF dual-hosted git repository. arusinha pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git. from 1e18daf [NETBEANS-2102] Do not add single files to the Gradle classpath. new 4fd115a [NETBEANS-2022]:Updation for external nb-javac jar in libs.javacapi and libs.javaimpl modules with nb-javac jar for jdk-12 new 6905fc2 Adding fixes to let tests pass after nb-javac upgrade. new 493f821 Merge pull request #2 from jlahoda/netbeans-2022 new fb44c5f Merge pull request #1121 from arusinha/netbeans-2022 The 2346 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../modules/java/source/save/CasualDiff.java | 4 +- .../lib/nbjavac/services/NBClassWriterTest.java| 2 +- java/libs.javacapi/external/binaries-list | 2 +- ...api-license.txt => nb-javac-12-api-license.txt} | 4 +- java/libs.javacapi/nbproject/project.xml | 2 +- java/libs.javacimpl/external/binaries-list | 2 +- ...pl-license.txt => nb-javac-12-impl-license.txt} | 4 +- java/libs.javacimpl/nbproject/project.xml | 2 +- .../modules/java/hints/spiimpl/JackpotTrees.java | 5 +- .../modules/java/hints/spiimpl/Utilities.java | 95 -- .../modules/java/hints/spiimpl/UtilitiesTest.java | 7 +- nbbuild/templates/projectized.xml | 2 +- 12 files changed, 108 insertions(+), 23 deletions(-) rename java/libs.javacapi/external/{nb-javac-9-api-license.txt => nb-javac-12-api-license.txt} (99%) rename java/libs.javacimpl/external/{nb-javac-9-impl-license.txt => nb-javac-12-impl-license.txt} (99%) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists