(netbeans) 01/01: Merge pull request #7105: ActionProvider & its Lookup consolidation in VSCode extension
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 69486b5bf0b989beea83448ed8645a3e9956d52e Merge: 6d0d7f2921 bd3abb833d Author: Jaroslav Tulach <1842422+jtul...@users.noreply.github.com> AuthorDate: Tue Feb 27 14:31:25 2024 +0100 Merge pull request #7105: ActionProvider & its Lookup consolidation in VSCode extension .../server/debugging/launch/NbLaunchDelegate.java | 56 --- .../java/lsp/server/TestCodeLanguageClient.java| 2 +- .../debugging/launch/NbLaunchDelegateTest.java | 167 + .../java/lsp/server/protocol/ServerTest.java | 77 +- .../modules/java/mx/project/ParseSuitesTest.java | 12 ++ .../modules/java/mx/project/multilinetexts.py | 53 +++ 6 files changed, 308 insertions(+), 59 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 (6d0d7f2921 -> 69486b5bf0)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 6d0d7f2921 Merge pull request #6999 from jGauravGupta/FISH-8023 add aaac3d0c8f Adding explicit multi line text test add 4c97649d8b Less UnsupportedOperationException in tests add 457008862b Concentrating lookup creation into createTargetLookup method add 372da96814 Merging with origin/master add bd3abb833d Include FileObject (and its lookup) even when working with whole Project new 69486b5bf0 Merge pull request #7105: ActionProvider & its Lookup consolidation in VSCode extension The 1 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: .../server/debugging/launch/NbLaunchDelegate.java | 56 --- .../java/lsp/server/TestCodeLanguageClient.java| 2 +- .../debugging/launch/NbLaunchDelegateTest.java | 167 + .../java/lsp/server/protocol/ServerTest.java | 77 +- .../modules/java/mx/project/ParseSuitesTest.java | 12 ++ .../modules/java/mx/project/multilinetexts.py | 53 +++ 6 files changed, 308 insertions(+), 59 deletions(-) create mode 100644 java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegateTest.java create mode 100644 java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/multilinetexts.py - 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 (3e15eaef7f -> 26997b2020)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 3e15eaef7f Merge pull request #7011 from jtulach/jtulach/MultiLineTextsInMx add 574338ac65 Revert "`NbLaunchDelegate` fix and test multi line texts in suite.py" new 26997b2020 Merge pull request #7061 from apache/revert-7011-jtulach/MultiLineTextsInMx The 1 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: .../server/debugging/launch/NbLaunchDelegate.java | 16 +-- .../debugging/launch/NbLaunchRequestHandler.java | 2 + .../debugging/launch/NbLaunchDelegateTest.java | 132 - .../modules/java/mx/project/ParseSuitesTest.java | 12 -- .../modules/java/mx/project/multilinetexts.py | 53 - 5 files changed, 4 insertions(+), 211 deletions(-) delete mode 100644 java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegateTest.java delete mode 100644 java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/multilinetexts.py - 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) 01/01: Merge pull request #7061 from apache/revert-7011-jtulach/MultiLineTextsInMx
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 26997b202022bf6a61b0d78966c6af3bc88de299 Merge: 3e15eaef7f 574338ac65 Author: Jaroslav Tulach <1842422+jtul...@users.noreply.github.com> AuthorDate: Tue Feb 13 11:24:08 2024 +0100 Merge pull request #7061 from apache/revert-7011-jtulach/MultiLineTextsInMx Revert "`NbLaunchDelegate` fix and test multi line texts in suite.py" .../server/debugging/launch/NbLaunchDelegate.java | 16 +-- .../debugging/launch/NbLaunchRequestHandler.java | 2 + .../debugging/launch/NbLaunchDelegateTest.java | 132 - .../modules/java/mx/project/ParseSuitesTest.java | 12 -- .../modules/java/mx/project/multilinetexts.py | 53 - 5 files changed, 4 insertions(+), 211 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 (4c43851e72 -> 3e15eaef7f)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 4c43851e72 Merge pull request #6987 from mbien/no-struts add e5c131a410 Test for handling multiline texts in suite.py add c27fa6f392 Put FileObject's DataObject in the Lookup sent to ActionProvider new 3e15eaef7f Merge pull request #7011 from jtulach/jtulach/MultiLineTextsInMx The 1 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: .../server/debugging/launch/NbLaunchDelegate.java | 16 ++- .../debugging/launch/NbLaunchRequestHandler.java | 2 - .../debugging/launch/NbLaunchDelegateTest.java | 132 + .../modules/java/mx/project/ParseSuitesTest.java | 12 ++ .../modules/java/mx/project/multilinetexts.py | 53 + 5 files changed, 211 insertions(+), 4 deletions(-) create mode 100644 java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegateTest.java create mode 100644 java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/multilinetexts.py - 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) 01/01: Merge pull request #7011 from jtulach/jtulach/MultiLineTextsInMx
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 3e15eaef7fb64b6f094918094d50ff5bc8195b1b Merge: 4c43851e72 c27fa6f392 Author: Jaroslav Tulach <1842422+jtul...@users.noreply.github.com> AuthorDate: Sun Feb 11 20:23:58 2024 +0100 Merge pull request #7011 from jtulach/jtulach/MultiLineTextsInMx `NbLaunchDelegate` fix and test multi line texts in suite.py .../server/debugging/launch/NbLaunchDelegate.java | 16 ++- .../debugging/launch/NbLaunchRequestHandler.java | 2 - .../debugging/launch/NbLaunchDelegateTest.java | 132 + .../modules/java/mx/project/ParseSuitesTest.java | 12 ++ .../modules/java/mx/project/multilinetexts.py | 53 + 5 files changed, 211 insertions(+), 4 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-html4j) branch master updated: Upgrading to latest Frgaal compiler
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git The following commit(s) were added to refs/heads/master by this push: new 30331ae5 Upgrading to latest Frgaal compiler 30331ae5 is described below commit 30331ae597585e0fcd56a52676e7417d7f57bdbe Author: Jaroslav Tulach AuthorDate: Mon Nov 13 05:34:17 2023 +0100 Upgrading to latest Frgaal compiler --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6f388e69..de3c2ecd 100644 --- a/pom.xml +++ b/pom.xml @@ -289,7 +289,7 @@ org.netbeans.html.boot.impl:org.netbeans.html.boot.fx:org.netbeans.html.context. compiler-maven-plugin org.frgaal -20.0.0 +21.0.0 - 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) 01/01: Navigate to Scala classes in Analyze Stack Window
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit aa95958ec999a9326bdb7459264b7b1fbcdb9310 Merge: 4a89c2b57a 32a9ff7702 Author: Jaroslav Tulach <1842422+jtul...@users.noreply.github.com> AuthorDate: Tue Oct 31 10:17:04 2023 +0100 Navigate to Scala classes in Analyze Stack Window .../java/stackanalyzer/StackLineAnalyser.java | 45 +- .../java/stackanalyzer/StackLineAnalyserTest.java | 9 + 2 files changed, 36 insertions(+), 18 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 (4a89c2b57a -> aa95958ec9)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 4a89c2b57a Merge pull request #6620 from jhorvath/sql_cc_priority add 32a9ff7702 Navigate to Scala classes in Analyze Stack Window new aa95958ec9 Navigate to Scala classes in Analyze Stack Window The 1 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/stackanalyzer/StackLineAnalyser.java | 45 +- .../java/stackanalyzer/StackLineAnalyserTest.java | 9 + 2 files changed, 36 insertions(+), 18 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 (f6df5f3323 -> aedaefefbc)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from f6df5f3323 Merge pull request #6179 from junichi11/php-gh-5681-reimplement add aedaefefbc Incremental compilation of NetBeans: All dependencies are prerequisite (#4523) No new revisions were added by this update. Summary of changes: ide/c.jcraft.jsch/nbproject/project.xml | 5 + 1 file changed, 5 insertions(+) - 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 (0f4aafed70 -> e5fb9c9958)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 0f4aafed70 Merge pull request #6161 from junichi11/php-reimplement-fix-imports new 8063d36628 Replacing dependency on LineDocument with NbDocument new eb6e98ac3c Splitting FormatterDocument into own top level class to avoid LineDocument imports in TextDocumentServiceImpl new e5fb9c9958 Merge pull request #6088 from jtulach/jtulach/LessLineDocumentDependencies The 8783 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/lsp/server/Utils.java| 18 +- .../lsp/server/protocol/FormatterDocument.java | 253 + .../ImplementAllAbstractMethodsAction.java | 8 +- .../server/protocol/TextDocumentServiceImpl.java | 417 + 4 files changed, 355 insertions(+), 341 deletions(-) create mode 100644 java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/FormatterDocument.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
[netbeans] 01/01: #5910: Breakpoints in Scala sources in VSCode
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit d89a420f7465097b0e872cde08f076202e2563f9 Merge: d6c8b6f88d 6034731992 Author: Jaroslav Tulach <1842422+jtul...@users.noreply.github.com> AuthorDate: Fri Jun 2 11:38:34 2023 +0200 #5910: Breakpoints in Scala sources in VSCode .../server/debugging/breakpoints/NbBreakpoint.java | 32 +- 1 file changed, 31 insertions(+), 1 deletion(-) - 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 (d6c8b6f88d -> d89a420f74)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from d6c8b6f88d Merge pull request #6013 from apache/update-issue-report-form-18 add 6034731992 Resolve breakpoints in Scala code new d89a420f74 #5910: Breakpoints in Scala sources in VSCode The 1 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: .../server/debugging/breakpoints/NbBreakpoint.java | 32 +- 1 file changed, 31 insertions(+), 1 deletion(-) - 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 (d371705b68 -> b03de5696e)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from d371705b68 Merge pull request #5677 from matthiasblaesing/js_improvements1 add a44b3ed9c9 Opt-in support for building NetBeans with nb-javac via nbjavac.class.path property add 91951b246b Using Matthias's version of nb-javac-smokecheck new b03de5696e Merge pull request #5609 from apache/jtulach/BuildNetBeansWithNbJavac The 1 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: .github/workflows/main.yml | 28 +++ .../antsrc/org/netbeans/nbbuild/CustomJavac.java | 14 +- .../netbeans/nbbuild/CustomJavacClassLoader.java | 203 + 3 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 nbbuild/antsrc/org/netbeans/nbbuild/CustomJavacClassLoader.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
[netbeans] 01/01: Merge pull request #5609 from apache/jtulach/BuildNetBeansWithNbJavac
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit b03de5696eb2c18f13877dabbf8641d92274dc3a Merge: d371705b68 91951b246b Author: Jaroslav Tulach <1842422+jtul...@users.noreply.github.com> AuthorDate: Sat Apr 1 16:39:46 2023 +0200 Merge pull request #5609 from apache/jtulach/BuildNetBeansWithNbJavac nb-javac: "Eat your own dog food" testing .github/workflows/main.yml | 28 +++ .../antsrc/org/netbeans/nbbuild/CustomJavac.java | 14 +- .../netbeans/nbbuild/CustomJavacClassLoader.java | 203 + 3 files changed, 244 insertions(+), 1 deletion(-) - 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 jtulach/BuildNetBeansWithNbJavac updated: Using Matthias's version of nb-javac-smokecheck
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch jtulach/BuildNetBeansWithNbJavac
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to
refs/heads/jtulach/BuildNetBeansWithNbJavac by this push:
new 91951b246b Using Matthias's version of nb-javac-smokecheck
91951b246b is described below
commit 91951b246b74f1d87fc5676df892cbf28abb33fb
Author: Jaroslav Tulach
AuthorDate: Sat Apr 1 09:20:46 2023 +0200
Using Matthias's version of nb-javac-smokecheck
---
.github/workflows/main.yml | 28
.github/workflows/nb-javac.yml | 25 -
2 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 63e5381017..29eba6b5ff 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -156,6 +156,34 @@ jobs:
retention-days: 7
if-no-files-found: error
+ nb-javac-smokecheck:
+name: "NetBeans on nb-javac"
+# Run test job only when the 'nb-javac' label is added
+if: ${{ contains(github.event.pull_request.labels.*.name, 'nb-javac') }}
+runs-on: ubuntu-latest
+steps:
+ - uses: actions/checkout@v3
+ - name: Set up JDK 8
+uses: actions/setup-java@v3
+with:
+distribution: 'zulu'
+java-version: 8
+ - name: Caching dependencies
+uses: actions/cache/restore@v3
+with:
+ path: ~/.hgexternalcache
+ key: ${{ runner.os }}-${{ hashFiles('*/external/binaries-list',
'*/*/external/binaries-list') }}
+ restore-keys: ${{ runner.os }}-
+ - name: Download External Binaries
+run: ant download-all-extbins
+ - name: Build NetBeans with nb-javac
+run: ant build -Dnbjavac.class.path=java/libs.javacapi/external/*.jar
+ - name: Setup Xvfb
+run: |
+ echo "DISPLAY=:99.0" >> $GITHUB_ENV
+ Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+ - name: Test with Commit Validation
+run: ant commit-validation
-Dnbjavac.class.path=java/libs.javacapi/external/*.jar
# secondary jobs
linux-commit-validation:
diff --git a/.github/workflows/nb-javac.yml b/.github/workflows/nb-javac.yml
deleted file mode 100644
index a75f4ad1ba..00
--- a/.github/workflows/nb-javac.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: nb-javac
-on: [push]
-# push:
-#branches: [ master ]
-jobs:
- linux:
-name: "NetBeans on nb-javac"
-runs-on: ubuntu-latest
-steps:
- - uses: actions/checkout@v2
- - name: Set up JDK 8
-uses: actions/setup-java@v2
-with:
-distribution: 'zulu'
-java-version: 8
- - name: Download External Binaries
-run: ant download-all-extbins
- - name: Build NetBeans with nb-javac
-run: ant build -Dnbjavac.class.path=java/libs.javacapi/external/*.jar
- - name: Setup Xvfb
-run: |
- echo "DISPLAY=:99.0" >> $GITHUB_ENV
- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
- - name: Test with Commit Validation
-run: ant commit-validation
-Dnbjavac.class.path=java/libs.javacapi/external/*.jar
-
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 jtulach/BuildNetBeansWithNbJavac updated (8018019cf3 -> a44b3ed9c9)
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a change to branch jtulach/BuildNetBeansWithNbJavac
in repository https://gitbox.apache.org/repos/asf/netbeans.git
omit 8018019cf3 Replacing `datesUntil` with "for loop" using JDK8 available
`LocalDate` methods
omit d9bacc6041 Merging with most recent master
omit 9c887bb448 Also version 20 of nbjavac suffers from problem in ct.sym
files
omit f2c0fd305e Moving classloading of nb-javac from JAR into its own
CustomJavacClassLoader class
omit 42ed77a476 Accepting changes from Matthias
omit 0112550f0a Removing duplicated definition of javac.compilerargs
omit 7de1422206 Build and commit validate NetBeans with its nb-javac
omit c8be6424ea Support absolute path in nbjavac.class.path property
omit 81b0bd588c Allow building NetBeans with NbJavac compiler
add 785f5e0e27 Make JDK URL calculation JDK 8 compatible
add 3414856d5b Merge pull request #5748 from matthiasblaesing/fix_jdk8
add 7d1014a5ed Add support for GlassFish 7.0.3
add 8f943c27e6 Merge pull request #5749 from pepness/glassfish-7.0.3
add 88483e73ea Separate between class-based, function-based, and
const-based use statements by a single blank line #4609
add 8d13bc2a05 Separate between class-based, function-based, and
const-based use statements by a single blank line #4609
add 11f3e9de73 Don't add a space before `{`
add 99ecf610ea Don't generate full class names
add e1b594034b Merge pull request #5758 from
junichi11/php-gh-4609-psr12-between-use-types
new a44b3ed9c9 Opt-in support for building NetBeans with nb-javac via
nbjavac.class.path property
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8018019cf3)
\
N -- N -- N refs/heads/jtulach/BuildNetBeansWithNbJavac
(a44b3ed9c9)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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/glassfish/common/Bundle.properties | 1 +
.../modules/glassfish/common/ServerDetails.java| 14 ++
.../glassfish/tooling/admin/AdminFactory.java | 1 +
.../glassfish/tooling/data/GlassFishVersion.java | 10 +-
.../server/config/ConfigBuilderProvider.java | 8 +-
.../glassfish/tooling/admin/AdminFactoryTest.java | 4 +-
.../tooling/data/GlassFishVersionTest.java | 6 +-
.../glassfish/tooling/utils/EnumUtilsTest.java | 26 +--
.../J2SEPlatformDefaultJavadocImpl.java| 10 +-
.../modules/php/editor/actions/Bundle.properties | 8 +-
.../editor/actions/FixDuplicateImportStmts.form| 3 +-
.../editor/actions/FixDuplicateImportStmts.java| 166 ++
.../php/editor/actions/FixImportsBottomPanel.form | 114 +
.../php/editor/actions/FixImportsBottomPanel.java | 159 ++
.../modules/php/editor/actions/FixUsesAction.java | 24 ++-
.../php/editor/actions/FixUsesPerformer.java | 71 +++-
.../modules/php/editor/indent/CodeStyle.java | 4 +
.../modules/php/editor/indent/FmtOptions.java | 2 +
.../modules/php/editor/indent/FormatToken.java | 1 +
.../modules/php/editor/indent/FormatVisitor.java | 13 ++
.../modules/php/editor/indent/TokenFormatter.java | 6 +
.../modules/php/editor/indent/ui/BlankLines.php| 6 +
.../modules/php/editor/indent/ui/Bundle.properties | 3 +
.../php/editor/indent/ui/FmtBlankLines.form| 64 +--
.../php/editor/indent/ui/FmtBlankLines.java| 57 ---
.../GroupUses/testGH4609PSR12_GroupUses.php| 71
.../testGH4609PSR12_GroupUses.php.fixUses | 81 +
.../testGH4609PSR12_GroupUsesWithPSR12a.php| 69
...testGH4609PSR12_GroupUsesWithPSR12a.php.fixUses | 83 +
.../testGH4609PSR12_GroupUsesWithPSR12b.php| 68
...testGH4609PSR12_GroupUsesWithPSR12b.php.fixUses | 80 +
.../testGH4609PSR12_GroupUsesWithPSR12c.php| 65 +++
...testGH4609PSR12_GroupUsesWithPSR12c.php.fixUses | 70
.../testGH4609PSR12_GroupUsesWithPSR12d.php| 67
...testGH4609PSR12_GroupUsesWithPSR12d.php.fixUses | 76 +
.../te
[netbeans] 01/01: Opt-in support for building NetBeans with nb-javac via nbjavac.class.path property
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch jtulach/BuildNetBeansWithNbJavac
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit a44b3ed9c94eaa7d3ad14bbaffe3cafe7c8b68c6
Author: Jaroslav Tulach
AuthorDate: Sat Apr 1 08:26:48 2023 +0200
Opt-in support for building NetBeans with nb-javac via nbjavac.class.path
property
---
.github/workflows/nb-javac.yml | 25 +++
.../antsrc/org/netbeans/nbbuild/CustomJavac.java | 14 +-
.../netbeans/nbbuild/CustomJavacClassLoader.java | 203 +
3 files changed, 241 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/nb-javac.yml b/.github/workflows/nb-javac.yml
new file mode 100644
index 00..a75f4ad1ba
--- /dev/null
+++ b/.github/workflows/nb-javac.yml
@@ -0,0 +1,25 @@
+name: nb-javac
+on: [push]
+# push:
+#branches: [ master ]
+jobs:
+ linux:
+name: "NetBeans on nb-javac"
+runs-on: ubuntu-latest
+steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK 8
+uses: actions/setup-java@v2
+with:
+distribution: 'zulu'
+java-version: 8
+ - name: Download External Binaries
+run: ant download-all-extbins
+ - name: Build NetBeans with nb-javac
+run: ant build -Dnbjavac.class.path=java/libs.javacapi/external/*.jar
+ - name: Setup Xvfb
+run: |
+ echo "DISPLAY=:99.0" >> $GITHUB_ENV
+ Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+ - name: Test with Commit Validation
+run: ant commit-validation
-Dnbjavac.class.path=java/libs.javacapi/external/*.jar
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
index c2f69cbe83..b219066cb8 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
@@ -20,6 +20,8 @@
package org.netbeans.nbbuild;
import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -115,6 +117,17 @@ public class CustomJavac extends Javac {
} else {
log("Warning: could not create " + generatedClassesDir,
Project.MSG_WARN);
}
+try {
+Class mainClazz =
CustomJavacClassLoader.findMainCompilerClass(getProject());
+if (mainClazz != null) {
+super.add(CustomJavacClassLoader.createCompiler(mainClazz));
+}
+} catch (ClassNotFoundException | MalformedURLException |
URISyntaxException ex) {
+if (ex instanceof BuildException) {
+throw (BuildException) ex;
+}
+throw new BuildException(ex);
+}
super.compile();
}
@@ -251,5 +264,4 @@ public class CustomJavac extends Javac {
}
return false;
}
-
}
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavacClassLoader.java
b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavacClassLoader.java
new file mode 100644
index 00..88c7e0bca9
--- /dev/null
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavacClassLoader.java
@@ -0,0 +1,203 @@
+/*
+ * 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.nbbuild;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.tools.StandardLocation;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.compilers.Javac13;
+import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.util.FileUtils;
+
+/**
+ * Helper class to allow using derivates of
[netbeans] branch jtulach/BuildNetBeansWithNbJavac updated: Replacing `datesUntil` with "for loop" using JDK8 available `LocalDate` methods
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch jtulach/BuildNetBeansWithNbJavac
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to
refs/heads/jtulach/BuildNetBeansWithNbJavac by this push:
new 8018019cf3 Replacing `datesUntil` with "for loop" using JDK8 available
`LocalDate` methods
8018019cf3 is described below
commit 8018019cf35825610c1e8ca9e59f96abe1aa3f04
Author: Jaroslav Tulach
AuthorDate: Fri Mar 31 14:43:44 2023 +0200
Replacing `datesUntil` with "for loop" using JDK8 available `LocalDate`
methods
---
.../platformdefinition/J2SEPlatformDefaultJavadocImpl.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformDefaultJavadocImpl.java
b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformDefaultJavadocImpl.java
index 4800d3635e..249432f338 100644
---
a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformDefaultJavadocImpl.java
+++
b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformDefaultJavadocImpl.java
@@ -67,10 +67,10 @@ public final class J2SEPlatformDefaultJavadocImpl
implements J2SEPlatformDefault
if (now.isAfter(jdk9)) { // time traveler -> only java 8 doc for you
int[] jdk = new int[] {9};
-jdk9.datesUntil(now, Period.ofMonths(6)).forEach((t) -> {
+for (LocalDate d = jdk9; d.compareTo(now) < 0; d =
d.plus(Period.ofMonths(6))) {
OFFICIAL_JAVADOC.put(String.valueOf(jdk[0]),
"https://docs.oracle.com/javase/"+jdk[0]+"/docs/api/;); // NOI18N
jdk[0]++;
-});
+}
OFFICIAL_JAVADOC.put(String.valueOf(jdk[0]),
"https://download.java.net/java/early_access/jdk"+jdk[0]+"/docs/api/;); //
NOI18N Early access
}
}
-
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] 01/04: Accepting changes from Matthias
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch jtulach/BuildNetBeansWithNbJavac
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 42ed77a476c582880b7aa3b03962ee07ff23fbd9
Author: Jaroslav Tulach
AuthorDate: Fri Mar 31 13:43:44 2023 +0200
Accepting changes from Matthias
---
.../antsrc/org/netbeans/nbbuild/CustomJavac.java | 33 +-
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
index 2c5775a917..0ed2c7c15e 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
@@ -30,9 +30,9 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import javax.tools.StandardLocation;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
@@ -276,6 +276,21 @@ public class CustomJavac extends Javac {
return false;
}
+/**
+ * Helper class to allow using derivates of the JDK javac to be used to
+ * compile modules. The primary use-case is to test building with nbjavac.
+ * It setups a special classloader, that loads the compiler (and related)
+ * classes from the classpath defined by the system property
+ * {@code nbjavac.class.path}.
+ *
+ * Warning/implementation note: The compiler class is cached in
+ * the system properties to improve performance. This results in system
+ * properties, that can't be serialized anymore and might be problematic
+ * for code not prepared for non-string values in Properties.
+ *
+ * A build failure with {@code nbjavac.class.path} is only a real
problem
+ * if it can be reproduced with the JDK itself.
+ */
private static final class NbJavacLoader extends URLClassLoader {
private static final String MAIN_COMPILER_CP = "nbjavac.class.path";
private static final String MAIN_COMPILER_CLASS =
"com.sun.tools.javac.Main";
@@ -283,7 +298,7 @@ public class CustomJavac extends Javac {
private NbJavacLoader(URL[] urls, ClassLoader parent) {
super(urls, parent);
-this.priorityLoaded = new HashMap<>();
+this.priorityLoaded = new ConcurrentHashMap<>();
}
private static synchronized Class findMainCompilerClass(
@@ -395,16 +410,20 @@ public class CustomJavac extends Javac {
}
}
}
-if ("-Werror".equals(args[i])) {
-args[i] = "-Xlint:none";
-}
}
+// nbjavac in version 19 contains invalid ct.sym files, which cause
+// warnings from build. Some of the modules are compiled with
+// -Werror and thus this breaks the build
+// Ater the update to version 20 this should be removed.
+String[] args2 = new String[args.length + 1];
+args2[0] = "-Xlint:-classfile";
+System.arraycopy(args, 0, args2, 1, args.length);
try {
Method compile = mainClazz.getMethod("compile",
String[].class);
-int result = (Integer) compile.invoke(null, (Object) args);
+int result = (Integer) compile.invoke(null, (Object) args2);
return result == 0;
} catch (Exception ex) {
-attributes.log("Compiler arguments: " + Arrays.toString(args),
Project.MSG_ERR);
+attributes.log("Compiler arguments: " +
Arrays.toString(args2), Project.MSG_ERR);
if (ex instanceof BuildException) {
throw (BuildException) ex;
}
-
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] 02/04: Moving classloading of nb-javac from JAR into its own CustomJavacClassLoader class
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch jtulach/BuildNetBeansWithNbJavac
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit f2c0fd305e2f9b8bdf322338461b09134fd9b046
Author: Jaroslav Tulach
AuthorDate: Fri Mar 31 13:51:34 2023 +0200
Moving classloading of nb-javac from JAR into its own
CustomJavacClassLoader class
---
.../antsrc/org/netbeans/nbbuild/CustomJavac.java | 172 +
.../netbeans/nbbuild/CustomJavacClassLoader.java | 203 +
2 files changed, 205 insertions(+), 170 deletions(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
index 0ed2c7c15e..b219066cb8 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
@@ -20,31 +20,20 @@
package org.netbeans.nbbuild;
import java.io.File;
-import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import javax.tools.StandardLocation;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
import org.apache.tools.ant.taskdefs.Javac;
-import org.apache.tools.ant.taskdefs.compilers.Javac13;
-import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.selectors.SelectorUtils;
-import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.JavaEnvUtils;
/**
@@ -129,9 +118,9 @@ public class CustomJavac extends Javac {
log("Warning: could not create " + generatedClassesDir,
Project.MSG_WARN);
}
try {
-Class mainClazz =
NbJavacLoader.findMainCompilerClass(getProject());
+Class mainClazz =
CustomJavacClassLoader.findMainCompilerClass(getProject());
if (mainClazz != null) {
-super.add(new NbJavacCompiler(mainClazz));
+super.add(CustomJavacClassLoader.createCompiler(mainClazz));
}
} catch (ClassNotFoundException | MalformedURLException |
URISyntaxException ex) {
if (ex instanceof BuildException) {
@@ -275,161 +264,4 @@ public class CustomJavac extends Javac {
}
return false;
}
-
-/**
- * Helper class to allow using derivates of the JDK javac to be used to
- * compile modules. The primary use-case is to test building with nbjavac.
- * It setups a special classloader, that loads the compiler (and related)
- * classes from the classpath defined by the system property
- * {@code nbjavac.class.path}.
- *
- * Warning/implementation note: The compiler class is cached in
- * the system properties to improve performance. This results in system
- * properties, that can't be serialized anymore and might be problematic
- * for code not prepared for non-string values in Properties.
- *
- * A build failure with {@code nbjavac.class.path} is only a real
problem
- * if it can be reproduced with the JDK itself.
- */
-private static final class NbJavacLoader extends URLClassLoader {
-private static final String MAIN_COMPILER_CP = "nbjavac.class.path";
-private static final String MAIN_COMPILER_CLASS =
"com.sun.tools.javac.Main";
-private final Map> priorityLoaded;
-
-private NbJavacLoader(URL[] urls, ClassLoader parent) {
-super(urls, parent);
-this.priorityLoaded = new ConcurrentHashMap<>();
-}
-
-private static synchronized Class findMainCompilerClass(
-Project prj
-) throws MalformedURLException, ClassNotFoundException,
URISyntaxException {
-String cp = prj.getProperty(MAIN_COMPILER_CP);
-if (cp == null) {
-return null;
-}
-
-Object c = System.getProperties().get(MAIN_COMPILER_CLASS);
-if (!(c instanceof Class)) {
-FileSet fs = new FileSet();
-final File cpPath = new File(cp);
-if (cpPath.isAbsolute()) {
-fs.setDir(cpPath.getParentFile());
-fs.setIncludes(cpPath.getName());
-} else {
-String nball = prj.getProperty("nb_all");
-if (nball != null) {
-fs.setDir(new File(nball));
-} else {
[netbeans] 03/04: Also version 20 of nbjavac suffers from problem in ct.sym files
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch jtulach/BuildNetBeansWithNbJavac
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 9c887bb4480c19c47d26a94d28e7ac3c23b227b6
Author: Jaroslav Tulach
AuthorDate: Fri Mar 31 14:01:35 2023 +0200
Also version 20 of nbjavac suffers from problem in ct.sym files
---
nbbuild/antsrc/org/netbeans/nbbuild/CustomJavacClassLoader.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavacClassLoader.java
b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavacClassLoader.java
index d33bac14a7..88c7e0bca9 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavacClassLoader.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavacClassLoader.java
@@ -179,10 +179,10 @@ final class CustomJavacClassLoader extends URLClassLoader
{
}
}
}
-// nbjavac in version 19 contains invalid ct.sym files, which cause
+// nbjavac in version 20 contains invalid ct.sym files, which cause
// warnings from build. Some of the modules are compiled with
// -Werror and thus this breaks the build
-// Ater the update to version 20 this should be removed.
+// Ater the update to version 20+ this should be removed.
String[] args2 = new String[args.length + 1];
args2[0] = "-Xlint:-classfile";
System.arraycopy(args, 0, args2, 1, args.length);
-
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-html4j] branch master updated: Upgrading to Frgaal 20.0.0
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new 45f8040d Upgrading to Frgaal 20.0.0
45f8040d is described below
commit 45f8040dd82f6ad173bd81f33a887b74d50f1a50
Author: Jaroslav Tulach
AuthorDate: Tue Mar 14 14:54:19 2023 +0100
Upgrading to Frgaal 20.0.0
---
html4j-maven-plugin/pom.xml | 3 +--
pom.xml | 8
webkit/pom.xml | 4 ++--
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/html4j-maven-plugin/pom.xml b/html4j-maven-plugin/pom.xml
index 87de5d05..ab9a1fb4 100644
--- a/html4j-maven-plugin/pom.xml
+++ b/html4j-maven-plugin/pom.xml
@@ -75,8 +75,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 1.7
- 1.7
+ 8
diff --git a/pom.xml b/pom.xml
index f3c15dbf..6f388e69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
${publicPackages}
META-INF.services.*
true
- 15
+ 20
json
@@ -289,14 +289,14 @@
org.netbeans.html.boot.impl:org.netbeans.html.boot.fx:org.netbeans.html.context.
compiler-maven-plugin
org.frgaal
-18.0.0
+20.0.0
frgaal
-17
+19
1.8
-17
+19
1.8
diff --git a/webkit/pom.xml b/webkit/pom.xml
index db8d589a..92ffd2d9 100644
--- a/webkit/pom.xml
+++ b/webkit/pom.xml
@@ -49,8 +49,8 @@
${project.version}
-1.7
-1.7
+20
+8
-
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 jtulach/BuildNetBeansWithNbJavac updated: Removing duplicated definition of javac.compilerargs
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch jtulach/BuildNetBeansWithNbJavac
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to
refs/heads/jtulach/BuildNetBeansWithNbJavac by this push:
new 0112550f0a Removing duplicated definition of javac.compilerargs
0112550f0a is described below
commit 0112550f0a792fc6cfe0f26d74defc057a6d5cd0
Author: Jaroslav Tulach
AuthorDate: Sun Mar 19 07:08:19 2023 +0100
Removing duplicated definition of javac.compilerargs
---
nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java | 3 ---
php/php.editor/nbproject/project.properties | 1 -
webcommon/javascript2.editor/nbproject/project.properties | 1 -
3 files changed, 5 deletions(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
index 2e17b218d4..2c5775a917 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
@@ -385,9 +385,6 @@ public class CustomJavac extends Javac {
if (args[i].startsWith("-Xbootclasspath/p:")) { // ide/html
bootClasspath = true;
}
-if (args[i].startsWith("-J")) {
-args[i] = "-Xlint:none"; // webcommon/javascript2.editor
-}
}
for (int i = 0; i < args.length; i++) {
if (!bootClasspath) {
diff --git a/php/php.editor/nbproject/project.properties
b/php/php.editor/nbproject/project.properties
index e3bdf01f85..fb4f6534a8 100644
--- a/php/php.editor/nbproject/project.properties
+++ b/php/php.editor/nbproject/project.properties
@@ -18,7 +18,6 @@ javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
build.compiler=extJavac
nbjavac.ignore.missing.enclosing=**/CUP$ASTPHP5Parser$actions.class
-javac.compilerargs=-J-Xmx512m
nbm.needs.restart=true
spec.version.base=2.23.0
release.external/predefined_vars-1.0.zip=docs/predefined_vars.zip
diff --git a/webcommon/javascript2.editor/nbproject/project.properties
b/webcommon/javascript2.editor/nbproject/project.properties
index 2e4c07dece..f65cf3326e 100644
--- a/webcommon/javascript2.editor/nbproject/project.properties
+++ b/webcommon/javascript2.editor/nbproject/project.properties
@@ -18,7 +18,6 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
build.compiler=extJavac
-javac.compilerargs=-J-Xmx512m
javadoc.arch=${basedir}/arch.xml
nbm.needs.restart=true
-
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 jtulach/BuildNetBeansWithNbJavac updated: Build and commit validate NetBeans with its nb-javac
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch jtulach/BuildNetBeansWithNbJavac in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/jtulach/BuildNetBeansWithNbJavac by this push: new 7de1422206 Build and commit validate NetBeans with its nb-javac 7de1422206 is described below commit 7de1422206891a6575c4c29bc727a1f32d25fb4d Author: Jaroslav Tulach AuthorDate: Sun Mar 19 06:16:09 2023 +0100 Build and commit validate NetBeans with its nb-javac --- .github/workflows/nb-javac.yml | 25 + 1 file changed, 25 insertions(+) diff --git a/.github/workflows/nb-javac.yml b/.github/workflows/nb-javac.yml new file mode 100644 index 00..a75f4ad1ba --- /dev/null +++ b/.github/workflows/nb-javac.yml @@ -0,0 +1,25 @@ +name: nb-javac +on: [push] +# push: +#branches: [ master ] +jobs: + linux: +name: "NetBeans on nb-javac" +runs-on: ubuntu-latest +steps: + - uses: actions/checkout@v2 + - name: Set up JDK 8 +uses: actions/setup-java@v2 +with: +distribution: 'zulu' +java-version: 8 + - name: Download External Binaries +run: ant download-all-extbins + - name: Build NetBeans with nb-javac +run: ant build -Dnbjavac.class.path=java/libs.javacapi/external/*.jar + - name: Setup Xvfb +run: | + echo "DISPLAY=:99.0" >> $GITHUB_ENV + Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & + - name: Test with Commit Validation +run: ant commit-validation -Dnbjavac.class.path=java/libs.javacapi/external/*.jar - 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 jtulach/BuildNetBeansWithNbJavac updated: Support absolute path in nbjavac.class.path property
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch jtulach/BuildNetBeansWithNbJavac
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to
refs/heads/jtulach/BuildNetBeansWithNbJavac by this push:
new c8be6424ea Support absolute path in nbjavac.class.path property
c8be6424ea is described below
commit c8be6424eaea456ba1f730afec9577e03afbe103
Author: Jaroslav Tulach
AuthorDate: Sat Mar 11 06:39:45 2023 +0100
Support absolute path in nbjavac.class.path property
---
nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
index ad39233960..2e17b218d4 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
@@ -297,13 +297,19 @@ public class CustomJavac extends Javac {
Object c = System.getProperties().get(MAIN_COMPILER_CLASS);
if (!(c instanceof Class)) {
FileSet fs = new FileSet();
-String nball = prj.getProperty("nb_all");
-if (nball != null) {
-fs.setDir(new File(nball));
+final File cpPath = new File(cp);
+if (cpPath.isAbsolute()) {
+fs.setDir(cpPath.getParentFile());
+fs.setIncludes(cpPath.getName());
} else {
-fs.setDir(prj.getBaseDir());
+String nball = prj.getProperty("nb_all");
+if (nball != null) {
+fs.setDir(new File(nball));
+} else {
+fs.setDir(prj.getBaseDir());
+}
+fs.setIncludes(cp);
}
-fs.setIncludes(cp);
List urls = new ArrayList<>();
final DirectoryScanner scan = fs.getDirectoryScanner(prj);
File base = scan.getBasedir();
-
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 jtulach/BuildNetBeansWithNbJavac created (now 81b0bd588c)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch jtulach/BuildNetBeansWithNbJavac in repository https://gitbox.apache.org/repos/asf/netbeans.git at 81b0bd588c Allow building NetBeans with NbJavac compiler This branch includes the following new commits: new 81b0bd588c Allow building NetBeans with NbJavac compiler The 1 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. - 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] 01/01: Allow building NetBeans with NbJavac compiler
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch jtulach/BuildNetBeansWithNbJavac
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 81b0bd588cbcb1dac7719bfd77a948645d587442
Author: Jaroslav Tulach
AuthorDate: Sun Mar 5 05:33:01 2023 +0100
Allow building NetBeans with NbJavac compiler
---
.../antsrc/org/netbeans/nbbuild/CustomJavac.java | 158 +
1 file changed, 158 insertions(+)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
index c2f69cbe83..ad39233960 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
@@ -20,18 +20,31 @@
package org.netbeans.nbbuild;
import java.io.File;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import javax.tools.StandardLocation;
import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
import org.apache.tools.ant.taskdefs.Javac;
+import org.apache.tools.ant.taskdefs.compilers.Javac13;
+import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.selectors.SelectorUtils;
+import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.JavaEnvUtils;
/**
@@ -115,6 +128,17 @@ public class CustomJavac extends Javac {
} else {
log("Warning: could not create " + generatedClassesDir,
Project.MSG_WARN);
}
+try {
+Class mainClazz =
NbJavacLoader.findMainCompilerClass(getProject());
+if (mainClazz != null) {
+super.add(new NbJavacCompiler(mainClazz));
+}
+} catch (ClassNotFoundException | MalformedURLException |
URISyntaxException ex) {
+if (ex instanceof BuildException) {
+throw (BuildException) ex;
+}
+throw new BuildException(ex);
+}
super.compile();
}
@@ -252,4 +276,138 @@ public class CustomJavac extends Javac {
return false;
}
+private static final class NbJavacLoader extends URLClassLoader {
+private static final String MAIN_COMPILER_CP = "nbjavac.class.path";
+private static final String MAIN_COMPILER_CLASS =
"com.sun.tools.javac.Main";
+private final Map> priorityLoaded;
+
+private NbJavacLoader(URL[] urls, ClassLoader parent) {
+super(urls, parent);
+this.priorityLoaded = new HashMap<>();
+}
+
+private static synchronized Class findMainCompilerClass(
+Project prj
+) throws MalformedURLException, ClassNotFoundException,
URISyntaxException {
+String cp = prj.getProperty(MAIN_COMPILER_CP);
+if (cp == null) {
+return null;
+}
+
+Object c = System.getProperties().get(MAIN_COMPILER_CLASS);
+if (!(c instanceof Class)) {
+FileSet fs = new FileSet();
+String nball = prj.getProperty("nb_all");
+if (nball != null) {
+fs.setDir(new File(nball));
+} else {
+fs.setDir(prj.getBaseDir());
+}
+fs.setIncludes(cp);
+List urls = new ArrayList<>();
+final DirectoryScanner scan = fs.getDirectoryScanner(prj);
+File base = scan.getBasedir();
+for (String relative : scan.getIncludedFiles()) {
+File file = new File(base, relative);
+URL url = FileUtils.getFileUtils().getFileURL(file);
+urls.add(url);
+}
+if (urls.isEmpty()) {
+throw new BuildException("Cannot find nb-javac JAR
libraries in " + base + " and " + cp);
+}
+URLClassLoader loader = new NbJavacLoader(urls.toArray(new
URL[0]), CustomJavac.class.getClassLoader().getParent());
+final Class newCompilerClass =
Class.forName(MAIN_COMPILER_CLASS, true, loader);
+assertIsolatedClassLoader(newCompilerClass, loader);
+System.getProperties().put(MAIN_COMPILER_CLASS,
newCompilerClass);
+c = newCompilerClass;
+}
+return (Class) c;
+}
+
+private st
[netbeans] branch master updated: GoToType dialog checks source attribute before disassembling bytecode
This is an automated email from the ASF dual-hosted git repository.
jtulach 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 9f36b30807 GoToType dialog checks source attribute before
disassembling bytecode
new e7c23916c7 Merge pull request #5539 from jtulach/jtulach/GoToScala
9f36b30807 is described below
commit 9f36b3080709bfa34bb79c2852100b957c739641
Author: Jaroslav Tulach
AuthorDate: Tue Feb 21 08:03:19 2023 +0100
GoToType dialog checks source attribute before disassembling bytecode
---
.../java/classfile/BinaryElementOpenImpl.java | 7 +++-
.../modules/java/classfile/CodeGenerator.java | 45 ++
.../netbeans/api/java/source/ui/ElementOpen.java | 4 +-
3 files changed, 38 insertions(+), 18 deletions(-)
diff --git
a/java/java.source/src/org/netbeans/modules/java/classfile/BinaryElementOpenImpl.java
b/java/java.source/src/org/netbeans/modules/java/classfile/BinaryElementOpenImpl.java
index 7d973c1fee..a981a58a0c 100644
---
a/java/java.source/src/org/netbeans/modules/java/classfile/BinaryElementOpenImpl.java
+++
b/java/java.source/src/org/netbeans/modules/java/classfile/BinaryElementOpenImpl.java
@@ -41,8 +41,13 @@ public class BinaryElementOpenImpl implements
BinaryElementOpen {
@Override
public boolean open(ClasspathInfo cpInfo, final ElementHandle toOpen, final AtomicBoolean cancel) {
-FileObject source = CodeGenerator.generateCode(cpInfo, toOpen);
+boolean[] sourceAttrApplied = { false };
+FileObject source = CodeGenerator.generateCode(cpInfo, toOpen,
sourceAttrApplied);
if (source != null) {
+if (sourceAttrApplied[0]) {
+ return open(source, 0);
+}
+
final int[] pos = new int[] {-1};
try {
diff --git
a/java/java.source/src/org/netbeans/modules/java/classfile/CodeGenerator.java
b/java/java.source/src/org/netbeans/modules/java/classfile/CodeGenerator.java
index 00f39a23cc..5c72770889 100644
---
a/java/java.source/src/org/netbeans/modules/java/classfile/CodeGenerator.java
+++
b/java/java.source/src/org/netbeans/modules/java/classfile/CodeGenerator.java
@@ -55,7 +55,6 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URL;
import java.security.MessageDigest;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
@@ -131,9 +130,13 @@ public class CodeGenerator {
static final String CLASSFILE_SOURCEFILE = "classfile-sourcefile";
//NOI18N
public static FileObject generateCode(final ClasspathInfo cpInfo, final
ElementHandle toOpenHandle) {
- if (UNUSABLE_KINDS.contains(toOpenHandle.getKind())) {
- return null;
- }
+ return generateCode(cpInfo, toOpenHandle, null);
+}
+
+public static FileObject generateCode(final ClasspathInfo cpInfo, final
ElementHandle toOpenHandle, boolean[] trySourceAttr) {
+if (UNUSABLE_KINDS.contains(toOpenHandle.getKind())) {
+ return null;
+}
try {
FileObject file =
FileUtil.createMemoryFileSystem().getRoot().createData(toOpenHandle.getKind()
== ElementKind.MODULE ? "module-info.java" : "test.java"); //NOI18N
@@ -171,11 +174,23 @@ public class CodeGenerator {
}
root = resource.getParent();
} else {
+
final ClassPath cp =
ClassPathSupport.createProxyClassPath(
cpInfo.getClassPath(PathKind.BOOT),
cpInfo.getClassPath(PathKind.COMPILE),
cpInfo.getClassPath(PathKind.SOURCE));
final TypeElement te = toOpen != null ?
wc.getElementUtilities().outermostTypeElement(toOpen) : null;
+if (trySourceAttr != null) {
+String name =
SourceUtils.findSourceFileName(toOpen);
+if (name != null) {
+FileObject found =
SourceUtils.getFile(toOpenHandle, cpInfo, name);
+if (found != null) {
+result[0] = found;
+trySourceAttr[0] = true;
+return;
+}
+}
+}
if (te == null) {
LOG.info("Cannot resolve element: " +
toOpenHandle.toString() + " on classpath: " + cp.toString()); //NOI18N
@@ -225,7 +240,7 @@ public class CodeGenerator {
result[0] = source;
String existingHash =
[netbeans] branch master updated (c07ee007fd -> 2a9e190afa)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from c07ee007fd Merge pull request #5211 from sdedic/lsp/serialize-fileobject new 93f6c381fd Extracts source name from .class and uses it to locate proper source file in ElementOpen.open new 0d1a434a72 Merge remote-tracking branch 'origin/master' into jtulach/ExtractSourceNameForClassFile new 34ab720624 Merging with master new f6040d3ffb Merge remote-tracking branch 'origin/master' into jtulach/ExtractSourceNameForClassFile new ca57354f7f Merge remote-tracking branch 'origin/master' into jtulach/ExtractSourceNameForClassFile new 7e73d76b6b Use the suggested names also when navigating via LSP in VSCode new e7d5437953 Introducing SourceUtils.findSourceFileName method that needs no reflection new 8520917a6b Merge remote-tracking branch 'origin/master' into jtulach/ExtractSourceNameForClassFile new 1ad59dc0a8 Removing unused import new 2a9e190afa Merge pull request #5152 from jtulach/jtulach/ExtractSourceNameForClassFile The 7908 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/java.editor/nbproject/project.xml | 2 +- .../netbeans/modules/editor/java/GoToSupport.java | 213 +++- .../editor/java/GoToSupportFileNameTest.java | 69 +++ .../modules/editor/java/GoToSupportTest.java | 194 +- java/java.source.base/apichanges.xml | 14 ++ .../org/netbeans/api/java/source/SourceUtils.java | 224 - .../netbeans/api/java/source/SourceUtilsTest.java | 187 ++--- .../api/java/source/SourceUtilsTestUtil.java | 9 + java/java.sourceui/apichanges.xml | 14 ++ .../netbeans/api/java/source/ui/ElementOpen.java | 107 ++ 10 files changed, 626 insertions(+), 407 deletions(-) create mode 100644 java/java.editor/test/unit/src/org/netbeans/modules/editor/java/GoToSupportFileNameTest.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
[netbeans] branch master updated: Locate sources JAR if it is next to binary JAR
This is an automated email from the ASF dual-hosted git repository.
jtulach 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 00baf1aa55 Locate sources JAR if it is next to binary JAR
new 9a86d279f8 Merge pull request #5156 from
jtulach/jtulach/SourceNextToBinary
00baf1aa55 is described below
commit 00baf1aa552d46e0b44622938546a9d9f7951ec8
Author: Jaroslav Tulach
AuthorDate: Tue Dec 27 04:53:45 2022 +0100
Locate sources JAR if it is next to binary JAR
---
.../classpath/SourceNextToBinaryQueryImpl.java | 65 ++
.../classpath/SourceNextToBinaryQueryImplTest.java | 49
2 files changed, 114 insertions(+)
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/classpath/SourceNextToBinaryQueryImpl.java
b/java/java.source.base/src/org/netbeans/modules/java/source/classpath/SourceNextToBinaryQueryImpl.java
new file mode 100644
index 00..8a8874bbb0
--- /dev/null
+++
b/java/java.source.base/src/org/netbeans/modules/java/source/classpath/SourceNextToBinaryQueryImpl.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.java.source.classpath;
+
+import java.net.URL;
+import javax.swing.event.ChangeListener;
+import org.netbeans.api.java.queries.SourceForBinaryQuery;
+import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation;
+import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation2;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+import org.openide.filesystems.URLMapper;
+import org.openide.util.lookup.ServiceProvider;
+
+@ServiceProvider(service = SourceForBinaryQueryImplementation.class, position
= 10)
+public final class SourceNextToBinaryQueryImpl implements
SourceForBinaryQueryImplementation {
+@Override
+public SourceForBinaryQuery.Result findSourceRoots(URL binaryRoot) {
+URL file = FileUtil.getArchiveFile(binaryRoot);
+if (file != null) {
+FileObject fo = URLMapper.findFileObject(file);
+if (fo != null) {
+FileObject src = fo.getParent().getFileObject(fo.getName() +
"-sources", fo.getExt());
+if (src != null) {
+return new SourceForBinaryQueryImplementation2.Result() {
+@Override
+public boolean preferSources() {
+return false;
+}
+
+@Override
+public FileObject[] getRoots() {
+return new
FileObject[]{FileUtil.getArchiveRoot(src)};
+}
+
+@Override
+public void addChangeListener(ChangeListener l) {
+}
+
+@Override
+public void removeChangeListener(ChangeListener l) {
+}
+};
+}
+}
+}
+return null;
+}
+}
diff --git
a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/classpath/SourceNextToBinaryQueryImplTest.java
b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/classpath/SourceNextToBinaryQueryImplTest.java
new file mode 100644
index 00..0393ee8325
--- /dev/null
+++
b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/classpath/SourceNextToBinaryQueryImplTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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
[netbeans] branch master updated: Prevent incremental compilation errors caused by annotation processor appending to existing file
This is an automated email from the ASF dual-hosted git repository.
jtulach 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 37b8ce4c64 Prevent incremental compilation errors caused by annotation
processor appending to existing file
37b8ce4c64 is described below
commit 37b8ce4c647cc9ed91d0c971233ee3febfa7d20e
Author: Jaroslav Tulach
AuthorDate: Mon Oct 10 13:28:41 2022 +0200
Prevent incremental compilation errors caused by annotation processor
appending to existing file
---
platform/api.search/nbproject/project.properties | 2 +-
platform/janitor/nbproject/project.properties| 2 +-
platform/sampler/nbproject/project.properties| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/platform/api.search/nbproject/project.properties
b/platform/api.search/nbproject/project.properties
index 7d593a009e..40a325103f 100644
--- a/platform/api.search/nbproject/project.properties
+++ b/platform/api.search/nbproject/project.properties
@@ -16,6 +16,6 @@
# under the License.
is.autoload=true
javac.source=1.8
-javac.compilerargs=-Xlint:all -Xlint:-serial -Werror
+javac.compilerargs=-Xlint:all -Xlint:-serial -Xlint:-processing -Werror
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/platform/janitor/nbproject/project.properties
b/platform/janitor/nbproject/project.properties
index cc5f75f7ee..038ab41a35 100644
--- a/platform/janitor/nbproject/project.properties
+++ b/platform/janitor/nbproject/project.properties
@@ -16,4 +16,4 @@
# under the License.
is.autoload=true
javac.source=1.8
-javac.compilerargs=-Xlint:all -Xlint:-serial -Werror
+javac.compilerargs=-Xlint:all -Xlint:-serial -Xlint:-processing -Werror
diff --git a/platform/sampler/nbproject/project.properties
b/platform/sampler/nbproject/project.properties
index 4c6597b097..3bb68e57b1 100644
--- a/platform/sampler/nbproject/project.properties
+++ b/platform/sampler/nbproject/project.properties
@@ -16,6 +16,6 @@
# under the License.
is.autoload=true
javac.source=1.8
-javac.compilerargs=-Xlint -Xlint:-serial -Werror
+javac.compilerargs=-Xlint -Xlint:-serial -Xlint:-processing -Werror
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-
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: Limit bootstrap libraries to java.se to avoid GraalVM's org.graalvm.polyglot being available
This is an automated email from the ASF dual-hosted git repository.
jtulach 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 5a90f24abf Limit bootstrap libraries to java.se to avoid GraalVM's
org.graalvm.polyglot being available
new 867ccd2d93 Merge pull request #4681 from
jtulach/jtulach/MxProjectsOnGraalVM
5a90f24abf is described below
commit 5a90f24abffde83b8ad7f8494697f9852ced04ea
Author: Jaroslav Tulach
AuthorDate: Sun Sep 25 08:55:19 2022 +0200
Limit bootstrap libraries to java.se to avoid GraalVM's
org.graalvm.polyglot being available
---
.../src/org/netbeans/modules/java/mx/project/SuiteProject.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteProject.java
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteProject.java
index 0de2b68736..494a4128de 100644
---
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteProject.java
+++
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteProject.java
@@ -114,7 +114,7 @@ final class SuiteProject implements Project {
private CompilerOptionsQueryImplementation.Result RESULT = new
Result() {
@Override
public List getArguments() {
-return Arrays.asList("--add-modules", "ALL-MODULE-PATH");
+return Arrays.asList("--add-modules", "ALL-MODULE-PATH",
"--limit-modules", "java.se");
}
@Override
-
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: Recognize generatedDependencies tag (#4666)
This is an automated email from the ASF dual-hosted git repository.
jtulach 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 1c79f0f7aa Recognize generatedDependencies tag (#4666)
1c79f0f7aa is described below
commit 1c79f0f7aaaf220043f9273ffe620a0c6331c693
Author: Jaroslav Tulach <1842422+jtul...@users.noreply.github.com>
AuthorDate: Wed Sep 21 17:32:46 2022 +0200
Recognize generatedDependencies tag (#4666)
Co-authored-by: Jaroslav Tulach
---
.../src/org/netbeans/modules/java/mx/project/CoreSuite.java| 7 +++
.../src/org/netbeans/modules/java/mx/project/SuiteSources.java | 5 -
.../org/netbeans/modules/java/mx/project/suitepy/MxProject.java| 2 ++
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/CoreSuite.java
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/CoreSuite.java
index d2270096c3..28e1b85043 100644
---
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/CoreSuite.java
+++
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/CoreSuite.java
@@ -160,6 +160,13 @@ final class CoreSuite {
return dependencies;
}
+@Override
+public List generatedDependencies() {
+return Collections.emptyList();
+}
+
+
+
@Override
public List annotationProcessors() {
return annotationProcessors;
diff --git
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java
index 4f9347e27c..096d2bf2b1 100644
---
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java
+++
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java
@@ -771,7 +771,10 @@ final class SuiteSources implements Sources,
@Override
public Collection depNames() {
-return mxPrj.dependencies();
+List both = new ArrayList<>();
+both.addAll(mxPrj.dependencies());
+both.addAll(mxPrj.generatedDependencies());
+return both;
}
@Override
diff --git
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/suitepy/MxProject.java
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/suitepy/MxProject.java
index f9268dcd64..6da50ae4af 100644
---
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/suitepy/MxProject.java
+++
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/suitepy/MxProject.java
@@ -29,6 +29,8 @@ public interface MxProject {
List dependencies();
+List generatedDependencies();
+
List annotationProcessors();
String javaCompliance();
-
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: added tests to org.openide.util.xml.XMLUtil: methods with 100% coverage: toElementContent - found 1 redundant 'if' statement which always evaluates true findSubElemen
This is an automated email from the ASF dual-hosted git repository.
jtulach 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 a21b2c60c4 added tests to org.openide.util.xml.XMLUtil: methods with
100% coverage: toElementContent - found 1 redundant 'if' statement which always
evaluates true findSubElement appendChildElement copyDocument - found 1
redundant 'if' statement which always evaluates true toAttributeValue
checkContentCharacters findElement fromHex checkAttributeCharacter toHex
findText
new 6ca3794987 Merge pull request #4294 from lbownik/openide.xml
a21b2c60c4 is described below
commit a21b2c60c4805420e023f50b3620ef79d1db2274
Author: Lukasz Bownik
AuthorDate: Tue Jun 28 10:55:45 2022 -0700
added tests to org.openide.util.xml.XMLUtil:
methods with 100% coverage:
toElementContent - found 1 redundant 'if' statement which always evaluates
true
findSubElement
appendChildElement
copyDocument - found 1 redundant 'if' statement which always evaluates true
toAttributeValue
checkContentCharacters
findElement
fromHex
checkAttributeCharacter
toHex
findText
---
.../test/unit/src/org/openide/xml/XMLUtilTest.java | 804 +
1 file changed, 804 insertions(+)
diff --git
a/platform/openide.util/test/unit/src/org/openide/xml/XMLUtilTest.java
b/platform/openide.util/test/unit/src/org/openide/xml/XMLUtilTest.java
new file mode 100644
index 00..796dbf6389
--- /dev/null
+++ b/platform/openide.util/test/unit/src/org/openide/xml/XMLUtilTest.java
@@ -0,0 +1,804 @@
+/*
+ * 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.openide.xml;
+
+import java.io.CharConversionException;
+import java.io.IOException;
+import java.util.List;
+import javax.xml.parsers.DocumentBuilderFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Test;
+import static org.openide.xml.XMLUtil.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+
+ */
+public class XMLUtilTest {
+
+private Document document;
+
+
//--
+private static void expectNullPointer(final Runnable code) {
+
+try {
+code.run();
+fail("Exception not thrown.");
+} catch (final NullPointerException e) {
+// good
+}
+}
+
+
//--
+private static void expectIllegalArgument(final Runnable code) {
+
+try {
+code.run();
+fail("Exception not thrown.");
+} catch (final IllegalArgumentException e) {
+// good
+}
+}
+
+
//--
+private static void expectIndexOutOfBounds(final Runnable code) {
+
+try {
+code.run();
+fail("Exception not thrown.");
+} catch (final IndexOutOfBoundsException e) {
+// good
+}
+}
+
+
//--
+private static String[] arrayOf(String... arr) {
+
+return arr;
+}
+
+
//--
+@Before
+public void setUp() throws Exception {
+
+this.document = DocumentBuilderFactory.newInstance().
+newDocumentBuilder().newDocument();
+}
+
+
//--
+@Test
+public void findText_throwsNullPointer_whenGivenNull() {
+
+expectNullPointer(() -> findText(null));
+}
+
+
//-
svn commit: r55731 - /dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/ /release/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/ /release/netbeans/netbeans-html4j/netbeans-html4j-1.8/
Author: jtulach Date: Thu Jul 14 03:27:10 2022 New Revision: 55731 Log: Apache NetBeans HTML/Java API 1.8.1 version has been approved Added: release/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/ - copied from r55580, dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/ Removed: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/ release/netbeans/netbeans-html4j/netbeans-html4j-1.8/ - 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: Build libs.graalsdk javadoc without warnings
This is an automated email from the ASF dual-hosted git repository.
jtulach 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 af266e5b79 Build libs.graalsdk javadoc without warnings
af266e5b79 is described below
commit af266e5b79ef65c88a9337c1b39d94c3aa62a049
Author: Jaroslav Tulach
AuthorDate: Sun Jul 10 07:27:10 2022 +0200
Build libs.graalsdk javadoc without warnings
---
ide/libs.graalsdk/src/org/netbeans/libs/graalsdk/package-info.java| 4 ++--
.../test/unit/src/org/netbeans/libs/graalsdk/ScriptingTutorial.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ide/libs.graalsdk/src/org/netbeans/libs/graalsdk/package-info.java
b/ide/libs.graalsdk/src/org/netbeans/libs/graalsdk/package-info.java
index b9b356dd83..438cf413f4 100644
--- a/ide/libs.graalsdk/src/org/netbeans/libs/graalsdk/package-info.java
+++ b/ide/libs.graalsdk/src/org/netbeans/libs/graalsdk/package-info.java
@@ -391,9 +391,9 @@ Found GraalVM:python
* a java object called from the script.
*
* Exceptions from the script code are always
- * reported as {@link ScriptException} that provides the appropriate details.
+ * reported as {@link javax.script.ScriptException} that provides the
appropriate details.
* Checked exceptions from host (java) code, unhandled by the script are
raised as
- * some {@link RuntimeException} subclasses; the {@link Throwable#getCause}
then indicates
+ * some {@link java.lang.RuntimeException} subclasses; the {@link
java.lang.Throwable#getCause} then indicates
* the original cause for the exception.
* Unchecked exceptions are directly propagated.
* {@snippet file="org/netbeans/libs/graalsdk/ScriptingTutorial.java"
region="handleScriptExceptions"}
diff --git
a/ide/libs.graalsdk/test/unit/src/org/netbeans/libs/graalsdk/ScriptingTutorial.java
b/ide/libs.graalsdk/test/unit/src/org/netbeans/libs/graalsdk/ScriptingTutorial.java
index 5dee128229..5b68db20b5 100644
---
a/ide/libs.graalsdk/test/unit/src/org/netbeans/libs/graalsdk/ScriptingTutorial.java
+++
b/ide/libs.graalsdk/test/unit/src/org/netbeans/libs/graalsdk/ScriptingTutorial.java
@@ -222,7 +222,7 @@ public class ScriptingTutorial extends NbTestCase {
// FastR currently needs access to native libraries:
final ScriptEngineManager manager =
Scripting.newBuilder().allowAllAccess(true).build();
ScriptEngine rEngine = manager.getEngineByMimeType("application/x-r");
-// END: org.netbeans.libs.graalsdk.ScriptingTutorial#allowAllAccess
+// @end region="allowAllAccess"
final Object funcRaw = rEngine.eval("qbinom");
BinomQuantile func = ((Invocable) rEngine).getInterface(funcRaw,
BinomQuantile.class);
-
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 (e7520fa0c4 -> 05da652de0)
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from e7520fa0c4 Merge pull request #4142 from mbien/completion-perf
new dfb65f38c1 Updating to codesnippetdoclet 0.82 that works on JDK-11
new 669e8f2027 Using JEP-413 tags in platform and ide clusters
new 66ace01413 Use JEP-413 @snippet tag in ideext, java and groovy clusters
new 043b6ea570 Only allow JEP-413 @snippet syntax
new 05da652de0 Merge pull request #4342 from jtulach/CodeSnippetDoclet0.82
The 7241 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:
.../api/execute/GradleExecConfiguration.java | 2 +-
.../modules/gradle/api/execute/RunUtils.java | 2 +-
.../gradle/execute/AbstractGradleExecutor.java | 15 +++--
.../spi/actions/DefaultGradleActionsProvider.java | 4 +-
.../gradle/spi/actions/GradleActionsProvider.java | 8 +--
.../gradle/spi/newproject/TemplateOperation.java | 15 +++--
.../test/unit/src/META-INF/generated-layer.xml | 4 +-
.../ConfigurableActionsProviderImplTest.java | 4 +-
.../modules/gradle/actions/action-mapping.xml | 4 +-
.../modules/gradle/actions/declarative-actions.xml | 12 ++--
.../gradle/actions/declarative-actions2.xml| 4 +-
.../gradle/api/execute/TestBundle.properties | 4 +-
.../api/parser/ApplyGroovyTransformation.java | 4 +-
.../editor/test/DisableTransformersStub.java | 4 +-
.../groovy/editor/test/GroovyTestTransformer.java | 4 +-
.../BinaryForSourceQueryImplementation2.java | 2 +-
.../java/queries/BinaryForSourceQuery2Test.java| 4 +-
.../src/org/netbeans/api/lsp/Completion.java | 2 +-
ide/api.lsp/src/org/netbeans/api/lsp/Hover.java| 2 +-
.../org/netbeans/api/lsp/HyperlinkLocation.java| 4 +-
.../org/netbeans/spi/lsp/CompletionCollector.java | 11 ++--
.../org/netbeans/spi/lsp/StructureProvider.java| 9 +--
.../src/org/netbeans/api/lsp/CompletionTest.java | 8 +--
.../unit/src/org/netbeans/api/lsp/HoverTest.java | 5 +-
.../netbeans/api/lsp/HyperlinkLocationTest.java| 10 ++--
.../base/ExplicitProcessParameters.java| 8 ++-
.../base/ExplicitProcessParametersTest.java| 8 +--
.../src/org/netbeans/libs/graalsdk/GraalSDK.java | 4 +-
.../netbeans/libs/graalsdk/impl/GraalContext.java | 4 +-
.../org/netbeans/libs/graalsdk/package-info.java | 32 +--
.../netbeans/libs/graalsdk/ScriptingTutorial.java | 67 +++---
.../api/debugger/jpda/ListeningDICookie.java | 4 +-
.../api/debugger/jpda/StartListeningTest.java | 4 +-
.../src/org/netbeans/api/maven/MavenActions.java | 4 +-
.../test/unit/src/META-INF/generated-layer.xml | 4 +-
.../org/netbeans/api/maven/test-maven-actions.xml | 4 +-
.../modules/gradle/java/api/ProjectActions.java| 4 +-
.../java/execute/JavaExecTokenProviderTest.java| 6 +-
.../gradle/java/execute/example-action-mapping.xml | 4 +-
.../netbeans/modules/maven/api/NbMavenProject.java | 2 +-
.../maven/api/execute/PrerequisitesChecker.java| 6 +-
.../maven/execute/MavenCommandLineExecutor.java| 3 +-
.../modules/maven/NbMavenProjectImplTest.java | 4 +-
.../modules/maven/api/execute/RunUtilsTest.java| 12 ++--
.../maven/execute/MavenExecutionTestBase.java | 4 +-
nbbuild/external/binaries-list | 2 +-
...nse.txt => codesnippet-doclet-0.82-license.txt} | 2 +-
nbbuild/javadoctools/template.xml | 6 +-
.../src/org/netbeans/api/htmlui/HTMLDialog.java| 6 +-
.../netbeans/api/htmlui/OpenHTMLRegistration.java | 4 +-
.../src/org/netbeans/api/htmlui/AskQuestion.java | 4 +-
.../unit/src/org/netbeans/api/htmlui/UICntrl.java | 4 +-
.../unit/src/org/netbeans/api/htmlui/dialog.html | 4 +-
.../src/org/netbeans/api/scripting/Scripting.java | 6 +-
.../api/scripting/JavaScriptEnginesTest.java | 4 +-
.../org/netbeans/api/scripting/ScriptingTest.java | 4 +-
.../api/scripting/ScriptingTutorialTest.java | 4 +-
.../src/org/openide/DialogDisplayer.java | 5 +-
.../unit/src/org/openide/DialogDisplayerTest.java | 4 +-
.../src/org/openide/util/Lookup.java | 2 +-
.../openide/util/lookup/SampleLookupUsages.java| 4 +-
.../src/org/openide/util/CharSequences.java| 14 ++---
.../src/org/openide/util/CharSequencesTest.java| 12 ++--
.../src/org/openide/util/CharSequencesTest.xml | 4 +-
64 files changed, 214 insertions(+), 216 deletions(-)
rename nbbuild/external/{codesnippet-doclet-0.30-license.txt =>
codesnippet-do
svn commit: r55580 - in /dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1: ./ netbeans-html4j-1.8.1.zip netbeans-html4j-1.8.1.zip.asc netbeans-html4j-1.8.1.zip.sha512
Author: jtulach Date: Thu Jul 7 05:31:54 2022 New Revision: 55580 Log: Preparing release 1.8.1 of HTML/Java API Added: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/ dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/netbeans-html4j-1.8.1.zip (with props) dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/netbeans-html4j-1.8.1.zip.asc dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/netbeans-html4j-1.8.1.zip.sha512 Added: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/netbeans-html4j-1.8.1.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/netbeans-html4j-1.8.1.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/netbeans-html4j-1.8.1.zip.asc == --- dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/netbeans-html4j-1.8.1.zip.asc (added) +++ dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/netbeans-html4j-1.8.1.zip.asc Thu Jul 7 05:31:54 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEETxTvPki77GNgjX6yE1SNfMr66A0FAmLGbWUACgkQE1SNfMr6 +6A1kdxAA50bBjQKk3IVOi8ztttclR7IGWYrVUnuJTay2jJRt5ZCVs15VKynB8VYf +mcjq6iTezpB+DeYNQsT1Q9NgMvD9CvURxu7D17AwS+liHIGsxc4Wjig8gXOjbLdd +XxcmsEij21FNEm2ne/AvHJP7NgyfCV7KHLxEEpqds4hyTYCOKFxfbuS2Ba5HjkS2 +blHwp03WSnfqjtWn/WRJFRn4nqY9fnhK1HLXjda3wneoC68DvW+RSA69fl23f+5X +8IAK/OTAtV38/4/LfgJu8YqOTk0Aza2HCwXUjpUoraGuNLSkS+ET8Oinnchpudbi +3RCXL61krfkY6VkEN5Ik/E1arqCpkiOT7e4ui9mKlFHU0qDITQJT3Zq2VX5iYTyp +W75Wi8zL3PFuswwr/MIZ339gC7DMqzJGt7ogtF7qzXox7XNYQ4jfViiS5C1/Bw2Y +Pbgycaam0PzklP5+Va6f59DaZsYI+wJ2eQF1lbSQze5sx87mtH6C4tmgqzEkw8A1 +CghiUjrBEme9CBpP4gqCiMhhC+rkBVsA04gi5qFcZSS0RIdqy9mTJzU649/f0mr8 +bOwFhRjxGsI7rGtwVFA+506TtIZ+//nv69Xp/7g3MhveDu5r+WbbtSPFosNqCijt +y8EDEj7mpDNFWUftlf3dRFuNtuj3FbOB5dYmM/LCYa7NXxxWB4o= +=oMpW +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/netbeans-html4j-1.8.1.zip.sha512 == --- dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/netbeans-html4j-1.8.1.zip.sha512 (added) +++ dev/netbeans/netbeans-html4j/netbeans-html4j-1.8.1/netbeans-html4j-1.8.1.zip.sha512 Thu Jul 7 05:31:54 2022 @@ -0,0 +1 @@ +6540380491059525eab26b8f331f7f7098acce33063237fb591ba5aba2c6b09be29ff51ac991971948ae57c74b86b32b6a09aa164b625f413ba9e2f7be9e8d2f netbeans-html4j-1.8.1.zip - 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-html4j] branch release updated (acae468d -> 27a930a0)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch release in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git omit acae468d Preparing version 1.8 add c8cf8085 Only expect promises and results when invoking AsyncJavaTest add 25ade6fd Merge pull request #47 from jtulach/jtulach/OnlyPromises add e8c378f7 Treat ko4j values as promises that may resolve later add bb97eb62 Removing the more and more outdated test based on env.js emulation for nashorn add cc66069e Merge pull request #48 from jtulach/jtulach/KnockoutValuesArePromises add f031ed4d In asynchronous mode: schedule flush on first added task add 1cc4c41b What's new in version 1.8.1 add af9b7e12 Suppress Graal.js interpreter warning add 61fa63c4 Include type of the presenter in the test name add 3a57153c Converting to text block add 074b0b94 Register global function callbacks under different names add 80696b1b Give each executor explicit name add be94a6b7 Check Promise.then isn't called prematurelly add e6a259ac Execute all tests in dedicated presenter's executor add f0d4774c Removing CallbackTest - tries to execute JavaScript from multiple threads add 082aef0b Bump groovy from 1.8.3 to 2.4.21 in /html4j-maven-plugin add 2b3148e0 Merge pull request #49 from apache/dependabot/maven/html4j-maven-plugin/org.codehaus.groovy-groovy-2.4.21 add 27a930a0 Ready to release version 1.8.1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (acae468d) \ N -- N -- N refs/heads/release (27a930a0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: boot-agent-test/pom.xml| 2 +- boot-fx/pom.xml| 4 +- boot-script/pom.xml| 4 +- .../java/html/boot/script/KnockoutEnvJSTest.java | 268 - boot/pom.xml | 4 +- browser/pom.xml| 2 +- context/pom.xml| 4 +- ecj-test/pom.xml | 4 +- equinox-agentclass-hook/pom.xml| 2 +- generic/pom.xml| 4 +- .../org/netbeans/html/presenters/spi/Generic.java | 19 +- .../presenters/spi/test/AsyncJavaOnlyTest.java | 60 + .../html/presenters/spi/test/CallbackTest.java | 63 - .../netbeans/html/presenters/spi/test/Case.java| 14 +- .../netbeans/html/presenters/spi/test/Counter.java | 15 +- .../html/presenters/spi/test/GenericTest.java | 27 ++- .../html/presenters/spi/test/SynchronizedTest.java | 36 ++- .../netbeans/html/presenters/spi/test/Testing.java | 45 ++-- geo/pom.xml| 4 +- html4j-maven-plugin/pom.xml| 6 +- json-tck/pom.xml | 6 +- .../java/html/js/tests/AsyncJavaScriptAction.java | 33 ++- .../java/net/java/html/js/tests/AsyncJavaTest.java | 42 +++- json/pom.xml | 4 +- ko-felix-test/pom.xml | 2 +- ko-osgi-test/pom.xml | 2 +- ko-ws-tyrus/pom.xml| 4 +- ko4j/pom.xml | 4 +- .../main/java/org/netbeans/html/ko4j/Knockout.java | 37 ++- pom.xml| 2 +- renderer/pom.xml | 2 +- sound/pom.xml | 4 +- src/main/javadoc/overview.html | 72 +++--- webkit/pom.xml | 2 +- xhr4j/pom.xml | 4 +- 35 files changed, 340 insertions(+), 467 deletions(-) delete mode 100644 boot-script/src/test/java/net/java/html/boot/script/KnockoutEnvJSTest.java create mode 100644 generic/src/test/java/org/netbeans/html/presenters/spi/test/AsyncJavaOnlyTest.java delete mode 100644 generic/src/test/java/org/netbeans/html/presenters/spi/test/CallbackTest.java - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional command
[netbeans-html4j] 01/01: Ready to release version 1.8.1
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to tag release-1.8.1
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit 27a930a06ede0751e2c1a25af81891dbebab525b
Author: Jaroslav Tulach
AuthorDate: Thu Jul 7 07:01:25 2022 +0200
Ready to release version 1.8.1
---
boot-agent-test/pom.xml | 2 +-
boot-fx/pom.xml | 4 ++--
boot-script/pom.xml | 4 ++--
boot/pom.xml| 4 ++--
browser/pom.xml | 2 +-
context/pom.xml | 4 ++--
ecj-test/pom.xml| 4 ++--
equinox-agentclass-hook/pom.xml | 2 +-
generic/pom.xml | 4 ++--
geo/pom.xml | 4 ++--
html4j-maven-plugin/pom.xml | 4 ++--
json-tck/pom.xml| 6 +++---
json/pom.xml| 4 ++--
ko-felix-test/pom.xml | 2 +-
ko-osgi-test/pom.xml| 2 +-
ko-ws-tyrus/pom.xml | 4 ++--
ko4j/pom.xml| 4 ++--
pom.xml | 2 +-
renderer/pom.xml| 2 +-
sound/pom.xml | 4 ++--
webkit/pom.xml | 2 +-
xhr4j/pom.xml | 4 ++--
22 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/boot-agent-test/pom.xml b/boot-agent-test/pom.xml
index 54c4e4a4..42727803 100644
--- a/boot-agent-test/pom.xml
+++ b/boot-agent-test/pom.xml
@@ -24,7 +24,7 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8.1
boot-agent-test
jar
diff --git a/boot-fx/pom.xml b/boot-fx/pom.xml
index 25e510f7..28d6d28c 100644
--- a/boot-fx/pom.xml
+++ b/boot-fx/pom.xml
@@ -24,11 +24,11 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8.1
org.netbeans.html
net.java.html.boot.fx
- 2.0-SNAPSHOT
+ 1.8.1
FX WebView Bootstrap
bundle
http://maven.apache.org
diff --git a/boot-script/pom.xml b/boot-script/pom.xml
index 692225b2..5ef6a063 100644
--- a/boot-script/pom.xml
+++ b/boot-script/pom.xml
@@ -24,11 +24,11 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8.1
Presenter via javax.script
net.java.html.boot.script
-2.0-SNAPSHOT
+1.8.1
bundle
none
diff --git a/boot/pom.xml b/boot/pom.xml
index 19968a5b..a33d9212 100644
--- a/boot/pom.xml
+++ b/boot/pom.xml
@@ -24,11 +24,11 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8.1
org.netbeans.html
net.java.html.boot
- 2.0-SNAPSHOT
+ 1.8.1
bundle
Browser Bootstrap
http://maven.apache.org
diff --git a/browser/pom.xml b/browser/pom.xml
index 466e044c..6921238b 100644
--- a/browser/pom.xml
+++ b/browser/pom.xml
@@ -26,7 +26,7 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8.1
Browser Presenter
diff --git a/context/pom.xml b/context/pom.xml
index 1f1cc293..f6da3881 100644
--- a/context/pom.xml
+++ b/context/pom.xml
@@ -24,11 +24,11 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8.1
org.netbeans.html
net.java.html
- 2.0-SNAPSHOT
+ 1.8.1
bundle
HTML Context
http://maven.apache.org
diff --git a/ecj-test/pom.xml b/ecj-test/pom.xml
index cd2b6059..66581eb8 100644
--- a/ecj-test/pom.xml
+++ b/ecj-test/pom.xml
@@ -24,11 +24,11 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8.1
org.netbeans.html
ecj-test
- 2.0-SNAPSHOT
+ 1.8.1
bundle
Testing ecj
http://maven.apache.org
diff --git a/equinox-agentclass-hook/pom.xml b/equinox-agentclass-hook/pom.xml
index 95222475..e19d703d 100644
--- a/equinox-agentclass-hook/pom.xml
+++ b/equinox-agentclass-hook/pom.xml
@@ -24,7 +24,7 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8.1
AgentClass Hook for Equinox
equinox-agentclass-hook
diff --git a/generic/pom.xml b/generic/pom.xml
index 670365ff..0d091380 100644
--- a/generic/pom.xml
+++ b/generic/pom.xml
@@ -24,13 +24,13 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8.1
generic
Generic ProtoPresenter
bundle
-2.0-SNAPSHOT
+1.8.1
${project.parent.basedir}
org.netbeans.html.presenters.spi
diff --git a/geo/pom.xml b/geo/pom.xml
index 928ece31..9256b6e6 100644
--- a/geo/pom.xml
+++ b/geo/pom.xml
@@ -24,11 +24,11 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8.1
org.netbeans.html
net.java.html.geo
- 2.0-SNAPSHOT
+ 1.8.1
bundle
Geolocation API
http://maven.apache.org
diff --git a/html4j-maven-plugin/pom.xml b/html4j-maven-plugin/pom.xml
index 87de5d05..8fe21214 100644
--- a/html4j-maven-plugin/pom.xml
+++ b/html4j-maven-plugin/pom.xml
@@ -24,12 +24,12 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8.1
maven-plugin
org.netbeans.html
html4j-maven-plugin
- 2.0-SNAPSHOT
+ 1.8.1
Html for Java Maven
[netbeans-html4j] tag release-1.8.1 created (now 27a930a0)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to tag release-1.8.1 in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git at 27a930a0 (commit) This tag includes the following new commits: new 27a930a0 Ready to release version 1.8.1 The 1 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. - 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-html4j] branch master updated (f0d4774c -> 2b3148e0)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git from f0d4774c Removing CallbackTest - tries to execute JavaScript from multiple threads add 082aef0b Bump groovy from 1.8.3 to 2.4.21 in /html4j-maven-plugin new 2b3148e0 Merge pull request #49 from apache/dependabot/maven/html4j-maven-plugin/org.codehaus.groovy-groovy-2.4.21 The 1 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: html4j-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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-html4j] 01/01: Merge pull request #49 from apache/dependabot/maven/html4j-maven-plugin/org.codehaus.groovy-groovy-2.4.21
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git commit 2b3148e005d3b277727f70f758328f4f5140ca53 Merge: f0d4774c 082aef0b Author: Jaroslav Tulach <1842422+jtul...@users.noreply.github.com> AuthorDate: Thu Jul 7 07:00:16 2022 +0200 Merge pull request #49 from apache/dependabot/maven/html4j-maven-plugin/org.codehaus.groovy-groovy-2.4.21 Bump groovy from 1.8.3 to 2.4.21 in /html4j-maven-plugin html4j-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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-html4j] branch master updated: Removing CallbackTest - tries to execute JavaScript from multiple threads
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new f0d4774c Removing CallbackTest - tries to execute JavaScript from
multiple threads
f0d4774c is described below
commit f0d4774c7d1114903b143dabd8fbeadb63a92116
Author: Jaroslav Tulach
AuthorDate: Thu Jul 7 06:51:26 2022 +0200
Removing CallbackTest - tries to execute JavaScript from multiple threads
---
.../html/presenters/spi/test/CallbackTest.java | 71 --
1 file changed, 71 deletions(-)
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/CallbackTest.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/CallbackTest.java
deleted file mode 100644
index ab51dd0e..
---
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/CallbackTest.java
+++ /dev/null
@@ -1,71 +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.html.presenters.spi.test;
-
-import java.lang.reflect.Method;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.logging.Level;
-import javax.script.ScriptException;
-import static org.testng.Assert.assertEquals;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Factory;
-
-public class CallbackTest {
-@Factory public static Object[] deadlockTests() throws Exception {
-return GenericTest.createTests(new CBP());
-}
-
-@AfterClass public static void countCallbacks() {
-assertEquals(Counter.callbacks, Counter.calls, "Every call to loadJS
is prefixed with a callback");
-}
-
-
-private static final class CBP extends Testing {
-
-public CBP() {
-super(false, Executors.newSingleThreadExecutor((r) -> {
-return new Thread(r, "Callback Executor");
-}));
-}
-
-@Override
-protected void loadJS(String js) {
-dispatch(new Runnable () {
-@Override
-public void run() {
-try {
-Object res = eng.eval("if (this.counter)
this.counter()");
-LOG.log(Level.FINE, "counter res: {0}", res);
-} catch (ScriptException ex) {
-LOG.log(Level.SEVERE, null, ex);
-}
-}
-});
-super.loadJS(js);
-}
-
-@Override void beforeTest(Class testClass) throws Exception {
-Class cntr =
testClass.getClassLoader().loadClass(Counter.class.getName());
-Method rc = cntr.getMethod("registerCounter");
-rc.invoke(null);
-}
-
-}
-}
-
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-html4j] branch master updated (80696b1b -> e6a259ac)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git from 80696b1b Give each executor explicit name new be94a6b7 Check Promise.then isn't called prematurelly new e6a259ac Execute all tests in dedicated presenter's executor The 2 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: .../org/netbeans/html/presenters/spi/Generic.java | 18 +-- .../presenters/spi/test/AsyncJavaOnlyTest.java | 1 - .../netbeans/html/presenters/spi/test/Case.java| 10 ++ .../html/presenters/spi/test/SynchronizedTest.java | 36 +- .../netbeans/html/presenters/spi/test/Testing.java | 17 +++--- .../java/net/java/html/js/tests/AsyncJavaTest.java | 18 ++- 6 files changed, 76 insertions(+), 24 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-html4j] 01/02: Check Promise.then isn't called prematurelly
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit be94a6b7de1ff3a444ad0454137fe4722ce0c814
Author: Jaroslav Tulach
AuthorDate: Wed Jul 6 10:20:14 2022 +0200
Check Promise.then isn't called prematurelly
---
.../java/net/java/html/js/tests/AsyncJavaTest.java | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaTest.java
b/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaTest.java
index 4c8f63b7..aac69f4f 100644
--- a/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaTest.java
+++ b/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaTest.java
@@ -19,6 +19,7 @@
package net.java.html.js.tests;
import static net.java.html.js.tests.JavaScriptBodyTest.assertEquals;
+import static net.java.html.js.tests.JavaScriptBodyTest.assertFalse;
import net.java.html.json.tests.PhaseExecutor;
import org.netbeans.html.json.tck.KOTest;
@@ -28,19 +29,20 @@ public class AsyncJavaTest {
@KOTest
public void dontWaitForJavaFactorial() throws Exception {
PhaseExecutor.schedule(phases, () -> {
-boolean[] javaExecuted = { false };
-Object objWithX = AsyncJava.computeInAsyncJava(5, (n) -> {
+Object[] arr = { null, false };
+arr[0] = AsyncJava.computeInAsyncJava(5, (n) -> {
int acc = 1;
for (int i = 1; i <= n; i++) {
acc *= i;
}
return acc;
-}, () -> {});
-int initialValue = Bodies.readIntX(objWithX);
-assertEquals(-1, initialValue, "Promise.then shall only be called
when the code ends");
-return objWithX;
-}).then((objWithX) -> {
-int result = Bodies.readIntX(objWithX);
+}, () -> {
+arr[1] = true;
+});
+assertFalse((Boolean) arr[1], "Promise.then shall only be called
when the code ends");
+return arr;
+}).then((arr) -> {
+int result = Bodies.readIntX(arr[0]);
assertEquals(result, 120);
}).start();
}
-
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-html4j] 02/02: Execute all tests in dedicated presenter's executor
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit e6a259acb1042a813e7a727f3a9b0f64d17dffd7
Author: Jaroslav Tulach
AuthorDate: Wed Jul 6 10:21:06 2022 +0200
Execute all tests in dedicated presenter's executor
---
.../org/netbeans/html/presenters/spi/Generic.java | 18 +--
.../presenters/spi/test/AsyncJavaOnlyTest.java | 1 -
.../netbeans/html/presenters/spi/test/Case.java| 10 ++
.../html/presenters/spi/test/SynchronizedTest.java | 36 +-
.../netbeans/html/presenters/spi/test/Testing.java | 17 +++---
5 files changed, 66 insertions(+), 16 deletions(-)
diff --git
a/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
b/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
index f766a10e..0e700f33 100644
--- a/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
+++ b/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
@@ -270,8 +270,20 @@ abstract class Generic implements Fn.Presenter,
Fn.KeepAlive, Flushable {
}
}
+/** Dispatch provided runnable for a later
+ *
+ * @param r the runnable to execute "later"
+ */
abstract void dispatch(Runnable r);
+final void dispatch(boolean runNowIfPossible, Runnable r) {
+if (runNowIfPossible && synchronous) {
+r.run();
+} else {
+dispatch(r);
+}
+}
+
/** Makes sure all pending calls into JavaScript are immediately
* performed.
*
@@ -738,8 +750,8 @@ abstract class Generic implements Fn.Presenter,
Fn.KeepAlive, Flushable {
microTasks.add(() -> {
javapromise(a1, a2, a3, a4);
});
-if (wasEmpty && !synchronous) {
-dispatch(this::flushImpl);
+if (wasEmpty) {
+dispatch(false, this::flushImpl);
}
}
}
@@ -827,7 +839,7 @@ abstract class Generic implements Fn.Presenter,
Fn.KeepAlive, Flushable {
private Frame dispatchPendingItem() {
final Frame top = topMostCall();
if (top instanceof CallJavaMethod && ((CallJavaMethod)top).method !=
null && ((CallJavaMethod)top).done == null) {
-dispatch(new Runnable() {
+dispatch(true, new Runnable() {
@Override
public void run() {
synchronized (lock()) {
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/AsyncJavaOnlyTest.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/AsyncJavaOnlyTest.java
index 35cf24bf..a1597ce7 100644
---
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/AsyncJavaOnlyTest.java
+++
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/AsyncJavaOnlyTest.java
@@ -18,7 +18,6 @@
*/
package org.netbeans.html.presenters.spi.test;
-import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import net.java.html.js.tests.AsyncJavaTest;
import org.netbeans.html.json.tck.KOTest;
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java
index de11b067..1e3b1247 100644
--- a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java
+++ b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java
@@ -54,13 +54,9 @@ public final class Case implements ITest, IHookable,
Runnable {
@Test
public void executeTest() throws Exception {
for (;;) {
-if (p instanceof Executor) {
-finished = new CountDownLatch(1);
-((Executor)p).execute(this);
-finished.await();
-} else {
-run();
-}
+finished = new CountDownLatch(1);
+t.CODE.execute(this);
+finished.await();
if (result instanceof InterruptedException && cnt++ < 100) {
Thread.sleep(100);
result = null;
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/SynchronizedTest.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/SynchronizedTest.java
index cf20bade..e649a8ae 100644
---
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/SynchronizedTest.java
+++
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/SynchronizedTest.java
@@ -19,6 +19,8 @@
package org.netbeans.html.presenters.spi.test;
import java.net.URL;
+import java.util.LinkedList;
+import java.util.concurrent.Executor;
import java.util.logging.Level;
import static org.netbeans.html.presenters.spi.test.GenericTest.createTests;
import static org.netbeans.html.presenters.spi.test.Testing.LOG;
@@ -31,7 +33,7 @@ public class Syn
[netbeans-html4j] 03/03: Give each executor explicit name
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit 80696b1b9f11963b4a93d2d4a75d89d433364d46
Author: Jaroslav Tulach
AuthorDate: Wed Jul 6 07:01:09 2022 +0200
Give each executor explicit name
---
.../netbeans/html/presenters/spi/test/AsyncJavaOnlyTest.java | 8
.../org/netbeans/html/presenters/spi/test/CallbackTest.java | 8
.../test/java/org/netbeans/html/presenters/spi/test/Case.java | 2 +-
.../org/netbeans/html/presenters/spi/test/GenericTest.java| 2 +-
.../java/org/netbeans/html/presenters/spi/test/Testing.java | 11 ++-
5 files changed, 24 insertions(+), 7 deletions(-)
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/AsyncJavaOnlyTest.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/AsyncJavaOnlyTest.java
index c9cd481e..35cf24bf 100644
---
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/AsyncJavaOnlyTest.java
+++
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/AsyncJavaOnlyTest.java
@@ -18,6 +18,8 @@
*/
package org.netbeans.html.presenters.spi.test;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
import net.java.html.js.tests.AsyncJavaTest;
import org.netbeans.html.json.tck.KOTest;
import static org.netbeans.html.presenters.spi.test.GenericTest.createTests;
@@ -35,6 +37,12 @@ public class AsyncJavaOnlyTest {
}
private static final class PromisesOnly extends Testing {
+
+public PromisesOnly() {
+super(false, Executors.newSingleThreadExecutor((r) -> {
+return new Thread(r, "PromisesOnly Executor");
+}));
+}
@Override
protected String js2java(String method, Object a1, Object a2, Object
a3, Object a4) throws Exception {
switch (method) {
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/CallbackTest.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/CallbackTest.java
index cdf03418..ab51dd0e 100644
---
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/CallbackTest.java
+++
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/CallbackTest.java
@@ -19,6 +19,8 @@
package org.netbeans.html.presenters.spi.test;
import java.lang.reflect.Method;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
import java.util.logging.Level;
import javax.script.ScriptException;
import static org.testng.Assert.assertEquals;
@@ -37,6 +39,12 @@ public class CallbackTest {
private static final class CBP extends Testing {
+public CBP() {
+super(false, Executors.newSingleThreadExecutor((r) -> {
+return new Thread(r, "Callback Executor");
+}));
+}
+
@Override
protected void loadJS(String js) {
dispatch(new Runnable () {
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java
index e2eaa811..de11b067 100644
--- a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java
+++ b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java
@@ -84,7 +84,7 @@ public final class Case implements ITest, IHookable, Runnable
{
tp.beforeTest(m.getDeclaringClass());
}
if (inst == null) {
-inst = m.getDeclaringClass().newInstance();
+inst = m.getDeclaringClass().getConstructor().newInstance();
}
result = m.invoke(inst);
if (result == null) {
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/GenericTest.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/GenericTest.java
index 49145072..321b4099 100644
---
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/GenericTest.java
+++
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/GenericTest.java
@@ -40,7 +40,7 @@ public class GenericTest {
}
@Factory public static Object[] compatibilityTests() throws Exception {
-return createTests(new Testing());
+return createTests(Testing.create());
}
static Object[] createTests(Testing t) throws Exception {
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Testing.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Testing.java
index 53038866..b60004ce 100644
--- a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Testing.java
+++ b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Testing.java
@@ -40,12 +40,13 @@ class Testing {
final boolean sync;
final ProtoPresenter presenter;
-public Testing() {
-this(false);
[netbeans-html4j] branch master updated (61fa63c4 -> 80696b1b)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git from 61fa63c4 Include type of the presenter in the test name new 3a57153c Converting to text block new 074b0b94 Register global function callbacks under different names new 80696b1b Give each executor explicit name The 3 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: .../html/presenters/spi/test/AsyncJavaOnlyTest.java| 8 .../html/presenters/spi/test/CallbackTest.java | 8 .../org/netbeans/html/presenters/spi/test/Case.java| 2 +- .../org/netbeans/html/presenters/spi/test/Counter.java | 15 --- .../netbeans/html/presenters/spi/test/GenericTest.java | 2 +- .../org/netbeans/html/presenters/spi/test/Testing.java | 11 ++- .../net/java/html/js/tests/AsyncJavaScriptAction.java | 18 +++--- .../java/net/java/html/js/tests/AsyncJavaTest.java | 7 --- 8 files changed, 47 insertions(+), 24 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-html4j] 01/03: Converting to text block
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit 3a57153c6682d83f8afc219371f5a33e0f61f7c6
Author: Jaroslav Tulach
AuthorDate: Tue Jul 5 08:22:09 2022 +0200
Converting to text block
---
.../org/netbeans/html/presenters/spi/test/Counter.java| 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Counter.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Counter.java
index 75a4a973..e50ad7a6 100644
--- a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Counter.java
+++ b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Counter.java
@@ -34,13 +34,14 @@ public final class Counter {
}
}
-@JavaScriptBody(args = {}, javacall = true, body
-= "if (!this.counter) {\n"
-+ " this.counter = function() { return
@org.netbeans.html.presenters.spi.test.Counter::count()(); };\n"
-+ " return true;\n"
-+ "} else {\n"
-+ " return false;\n"
-+ "}\n"
+@JavaScriptBody(args = {}, javacall = true, body = """
+if (!this.counter) {
+ this.counter = function() { return
@org.netbeans.html.presenters.spi.test.Counter::count()(); };
+ return true;
+} else {
+ return false;
+}
+"""
)
private static native boolean rCounter();
-
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-html4j] 02/03: Register global function callbacks under different names
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit 074b0b948988ff46695fde9877e7461d8e1373fa
Author: Jaroslav Tulach
AuthorDate: Wed Jul 6 07:00:37 2022 +0200
Register global function callbacks under different names
---
.../net/java/html/js/tests/AsyncJavaScriptAction.java | 18 +++---
.../java/net/java/html/js/tests/AsyncJavaTest.java | 7 ---
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git
a/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaScriptAction.java
b/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaScriptAction.java
index 7cf1d667..26c255a5 100644
--- a/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaScriptAction.java
+++ b/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaScriptAction.java
@@ -21,16 +21,20 @@ package net.java.html.js.tests;
import net.java.html.js.JavaScriptBody;
final class AsyncJavaScriptAction {
+private final String name;
private int result;
-private AsyncJavaScriptAction() {
+private AsyncJavaScriptAction(String name) {
+this.name = name;
}
static AsyncJavaScriptAction defineCallback(boolean wait4js) {
-AsyncJavaScriptAction action = new AsyncJavaScriptAction();
+AsyncJavaScriptAction action;
if (wait4js) {
+action = new AsyncJavaScriptAction("callJava");
action.defineCallbackImpl();
} else {
+action = new AsyncJavaScriptAction("callJavaNoWait");
action.defineCallbackImplNoWait4js();
}
return action;
@@ -48,7 +52,7 @@ final class AsyncJavaScriptAction {
@JavaScriptBody(args = {}, javacall = true, wait4js = false, wait4java =
false, body = """
var self = this;
var global = (0 || eval)("this");
-global.callJava = function(s) {
+global.callJavaNoWait = function(s) {
se...@net.java.html.js.tests.AsyncJavaScriptAction::callJava(I)(s);
};
""")
@@ -58,16 +62,16 @@ final class AsyncJavaScriptAction {
this.result = i;
}
-static boolean invokeCallbackLater(int n) {
+boolean invokeCallbackLater(int n) {
return JsUtils.executeNow(AsyncJavaScriptAction.class, """
if (typeof setTimeout === 'function') {
setTimeout(function() {
-callJava($n);
+$name($n);
}, 5);
} else {
-callJava($n);
+$name($n);
}
-""".replaceAll("\\$n", "" + n));
+""".replaceAll("\\$name", name).replaceAll("\\$n", "" + n));
}
int getResult() {
diff --git a/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaTest.java
b/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaTest.java
index 258bd5e0..4c8f63b7 100644
--- a/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaTest.java
+++ b/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaTest.java
@@ -59,11 +59,12 @@ public class AsyncJavaTest {
PhaseExecutor.schedule(phases, () -> {
return AsyncJavaScriptAction.defineCallback(wait4js);
}).then((action) -> {
-AsyncJavaScriptAction.invokeCallbackLater(33);
+action.invokeCallbackLater(33);
}).then((action) -> {
-assertEquals(action.getResult(), 33, "Set to 33");
+final int r = action.getResult();
+assertEquals(r, 33, "Set to 33");
}).then((action) -> {
-AsyncJavaScriptAction.invokeCallbackLater(42);
+action.invokeCallbackLater(42);
}).then((action) -> {
assertEquals(action.getResult(), 42, "Set to 42");
}).start();
-
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-html4j] 02/02: Include type of the presenter in the test name
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit 61fa63c499ff1e6e4d6b1e121c6e4f5037afe10a
Author: Jaroslav Tulach
AuthorDate: Tue Jul 5 07:36:20 2022 +0200
Include type of the presenter in the test name
---
generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java
index 8f4b94fa..e2eaa811 100644
--- a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java
+++ b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java
@@ -48,7 +48,7 @@ public final class Case implements ITest, IHookable, Runnable
{
@Override
public String getTestName() {
-return m.getDeclaringClass().getSimpleName() + "." + m.getName();
+return t.getClass().getSimpleName() + ":" +
m.getDeclaringClass().getSimpleName() + "." + m.getName();
}
@Test
-
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-html4j] 01/02: Suppress Graal.js interpreter warning
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit af9b7e12d1330bbfdbe002f84531f95a25605238
Author: Jaroslav Tulach
AuthorDate: Tue Jul 5 07:35:42 2022 +0200
Suppress Graal.js interpreter warning
---
.../src/test/java/org/netbeans/html/presenters/spi/test/Testing.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Testing.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Testing.java
index 30fa7892..53038866 100644
--- a/generic/src/test/java/org/netbeans/html/presenters/spi/test/Testing.java
+++ b/generic/src/test/java/org/netbeans/html/presenters/spi/test/Testing.java
@@ -31,6 +31,9 @@ import org.netbeans.html.presenters.spi.ProtoPresenter;
import org.netbeans.html.presenters.spi.ProtoPresenterBuilder;
class Testing {
+static {
+System.setProperty("polyglot.engine.WarnInterpreterOnly", "false");
+}
static final Logger LOG = Logger.getLogger(Testing.class.getName());
final Executor QUEUE;
final ScriptEngine eng;
-
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-html4j] branch master updated (1cc4c41b -> 61fa63c4)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git from 1cc4c41b What's new in version 1.8.1 new af9b7e12 Suppress Graal.js interpreter warning new 61fa63c4 Include type of the presenter in the test name The 2 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: generic/src/test/java/org/netbeans/html/presenters/spi/test/Case.java | 2 +- .../src/test/java/org/netbeans/html/presenters/spi/test/Testing.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) - 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-html4j] branch master updated: What's new in version 1.8.1
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new 1cc4c41b What's new in version 1.8.1
1cc4c41b is described below
commit 1cc4c41b0c3ecb7804b035a54c28ab52e5f4ac1e
Author: Jaroslav Tulach
AuthorDate: Mon Jul 4 20:38:07 2022 +0200
What's new in version 1.8.1
---
src/main/javadoc/overview.html | 72 ++
1 file changed, 44 insertions(+), 28 deletions(-)
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
index d4af96f2..90d1b209 100644
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@@ -27,13 +27,13 @@
-The HTML/Java API is an alternative to Swing and JavaFX for
creating
-applications with a graphical user interface. It's major strengths is
the
-intelligent combination of existing technologies.
+The HTML/Java API is an alternative to Swing and JavaFX for
creating
+applications with a graphical user interface. It's major strengths is
the
+intelligent combination of existing technologies.
With HTML/Java, the proven model used on servers for many years, has
been ported to the client.
Java is used for developing business and view logic, while
- HTML5, CSS and JavaScript are used to render the UI.
+ HTML5, CSS and JavaScript are used to render the UI.
Get the best of both worlds by combining the industry stability of
Java and richness of JavaScript ecosystem when it comes
to UI and rendering frameworks.
@@ -47,21 +47,21 @@
With Java/HTML we created a better and more powerful alternative,
which is still small and easy to maintain.
Model View ViewModel Pattern
- For this Java/HTML makes use of the
+ For this Java/HTML makes use of the
https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93viewmodel;>Model
View ViewModel (MVVM)
pattern to separate
the view from the logic of the application. This approach is different
from Swing or JavaFX, as the Java code doesn't require any references
to the widgets
- that are displayed in the view. The Java code instead exposes {@link
net.java.html.json.Property properties}
+ that are displayed in the view. The Java code instead exposes {@link
net.java.html.json.Property properties}
for the View to bind to, and {@link net.java.html.json.Function
functions} that can be called in response to user
interactions. This keeps the {@link net.java.html.json.Model Java
API} small and simple to learn.
-
-
+
+
Supported Platforms
This architecture also makes it easy to port the technology to
different platforms. Porting of HTML/Java is as easy as implementing
{@link org.netbeans.html.boot.spi.Fn.Presenter}
interface and successfully passing the
-{@link org.netbeans.html.json.tck test compatibility kit}.
+{@link org.netbeans.html.json.tck test compatibility kit}.
Various ports of this rendering pipeline were built including support
for
pure https://github.com/dukescript/dukescript-presenters/;>"webkit desktop
rendring
https://dukescript.com/javadoc/presenters/com/dukescript/presenters/Android.html;>Android
WebView
@@ -79,40 +79,40 @@
The easiest way to get started is following the
https://dukescript.com/getting_started.html;>getting started
tutorial. If you prefer commandline you can also use the https://github.com/dukescript/maven-archetypes; target="_blank">Maven
Archetypes.
-
+
Just type:
$ mvn archetype:generate \
-DarchetypeGroupId=com.dukescript.archetype \
-DarchetypeArtifactId=knockout4j-archetype \
--DgroupId=your.company -DartifactId=test -Dversion=1.0-SNAPSHOT
+-DgroupId=your.company -DartifactId=test -Dversion=1.0-SNAPSHOT
-DarchetypeVersion=0.30 \ # or newer version, if available
-
-and then you can:
+
+and then you can:
$ cd test
$ mvn install
$ mvn -f client/pom.xml process-classes exec:exec
-
+
More Information
-We tried to make our API Docs as useful as possible, so they
contain
+We tried to make our API Docs as useful as possible, so they contain
lots of valuable information. So this should be your first stop
when looking for information:
Current https://dukescript.com/javadoc/html+java/dev/;>development version
-
+
The http://dukescript.com; target="_blank">DukeScript
project contains a lot of information
[netbeans-html4j] branch master updated: In asynchronous mode: schedule flush on first added task
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new f031ed4d In asynchronous mode: schedule flush on first added task
f031ed4d is described below
commit f031ed4df296ac3213dca79a32d4737c2bcbab26
Author: Jaroslav Tulach
AuthorDate: Mon Jul 4 20:11:29 2022 +0200
In asynchronous mode: schedule flush on first added task
---
generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
b/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
index 008b3335..f766a10e 100644
--- a/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
+++ b/generic/src/main/java/org/netbeans/html/presenters/spi/Generic.java
@@ -734,10 +734,11 @@ abstract class Generic implements Fn.Presenter,
Fn.KeepAlive, Flushable {
final void registerPromise(String a1, String a2, String a3, String a4) {
synchronized (lock()) {
+boolean wasEmpty = microTasks.isEmpty();
microTasks.add(() -> {
javapromise(a1, a2, a3, a4);
});
-if (topMostCall() == null) {
+if (wasEmpty && !synchronous) {
dispatch(this::flushImpl);
}
}
-
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 (35bf796469 -> a5c8929d8d)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 35bf796469 NotifyDescriptor.ComposedInput added. (#4203) new 059fd30a51 Removing useless initializaiton new f536e23575 Register the processor also for @ActionsProvider.Registrations new a5c8929d8d Merge pull request #4255 from jtulach/jtulach/ActionsProviderRegistrations The 7184 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: .../src/org/netbeans/debugger/registry/DebuggerProcessor.java | 1 + .../src/org/netbeans/spi/debugger/ActionsProviderSupport.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) - 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-html4j] branch master updated (25ade6fd -> cc66069e)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git from 25ade6fd Merge pull request #47 from jtulach/jtulach/OnlyPromises new e8c378f7 Treat ko4j values as promises that may resolve later new bb97eb62 Removing the more and more outdated test based on env.js emulation for nashorn new cc66069e Merge pull request #48 from jtulach/jtulach/KnockoutValuesArePromises The 429 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/html/boot/script/KnockoutEnvJSTest.java | 268 - .../main/java/org/netbeans/html/ko4j/Knockout.java | 37 ++- 2 files changed, 31 insertions(+), 274 deletions(-) delete mode 100644 boot-script/src/test/java/net/java/html/boot/script/KnockoutEnvJSTest.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
[netbeans-html4j] branch master updated: Only expect promises and results when invoking AsyncJavaTest
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new c8cf8085 Only expect promises and results when invoking AsyncJavaTest
new 25ade6fd Merge pull request #47 from jtulach/jtulach/OnlyPromises
c8cf8085 is described below
commit c8cf80859afe0550e327fac6b7023d2ee7d3be89
Author: Jaroslav Tulach
AuthorDate: Sun May 22 14:17:18 2022 +0200
Only expect promises and results when invoking AsyncJavaTest
---
.../presenters/spi/test/AsyncJavaOnlyTest.java | 53 ++
.../html/presenters/spi/test/GenericTest.java | 25 ++
.../netbeans/html/presenters/spi/test/Testing.java | 14 --
.../java/html/js/tests/AsyncJavaScriptAction.java | 17 ++-
.../java/net/java/html/js/tests/AsyncJavaTest.java | 17 ++-
5 files changed, 109 insertions(+), 17 deletions(-)
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/AsyncJavaOnlyTest.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/AsyncJavaOnlyTest.java
new file mode 100644
index ..c9cd481e
--- /dev/null
+++
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/AsyncJavaOnlyTest.java
@@ -0,0 +1,53 @@
+/**
+ * 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.html.presenters.spi.test;
+
+import net.java.html.js.tests.AsyncJavaTest;
+import org.netbeans.html.json.tck.KOTest;
+import static org.netbeans.html.presenters.spi.test.GenericTest.createTests;
+import org.testng.annotations.Factory;
+
+public class AsyncJavaOnlyTest {
+@Factory
+public static Object[] compatibilityTests() throws Exception {
+return createTests(new PromisesOnly(), (m) -> {
+if (m.getDeclaringClass() == AsyncJavaTest.class) {
+return m.getAnnotation(KOTest.class) != null;
+}
+return false;
+});
+}
+
+private static final class PromisesOnly extends Testing {
+@Override
+protected String js2java(String method, Object a1, Object a2, Object
a3, Object a4) throws Exception {
+switch (method) {
+case "p":
+// promise is OK
+break;
+case "r":
+// result of JavaScript evaluation
+break;
+default:
+throw new IllegalStateException("Unexpected method " +
method + "(" + a1 + ", " + a2 + ", " + a3 + ", " + a4 + "). Expecting only
promises!");
+}
+return super.js2java(method, a1, a2, a3, a4);
+}
+}
+}
diff --git
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/GenericTest.java
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/GenericTest.java
index f9aae5b1..49145072 100644
---
a/generic/src/test/java/org/netbeans/html/presenters/spi/test/GenericTest.java
+++
b/generic/src/test/java/org/netbeans/html/presenters/spi/test/GenericTest.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Executors;
+import java.util.function.Predicate;
import net.java.html.boot.BrowserBuilder;
import org.netbeans.html.boot.spi.Fn;
import org.netbeans.html.json.tck.KOTest;
@@ -30,7 +31,7 @@ import org.testng.annotations.Factory;
public class GenericTest {
private static Class browserClass;
-
+
public GenericTest() {
}
@@ -41,8 +42,12 @@ public class GenericTest {
@Factory public static Object[] compatibilityTests() throws Exception {
return createTests(new Testing());
}
-
+
static Object[] createTests(Testing t) throws Exception {
+return createTests(t, null);
+}
+
+static Object[] createTests(Testing t, Predicate accept) throws
Exception {
Fn.Presenter presenter = t.presenter;
final BrowserBuilder bb =
BrowserBuilder.newBrowser(presenter).loadClass(Ge
[netbeans] branch master updated: Including additional methods into knownBLockingMethods to match classes as of JDK-11
This is an automated email from the ASF dual-hosted git repository.
jtulach 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 e9b28713a3 Including additional methods into knownBLockingMethods to
match classes as of JDK-11
new ff09cf74c3 Merge pull request #4168 from
jtulach/jtulach/MoreKnownBlockingMethods
e9b28713a3 is described below
commit e9b28713a3b62021a4dc58f3db53ba1c46c206e0
Author: Jaroslav Tulach
AuthorDate: Sat May 28 08:26:05 2022 +0200
Including additional methods into knownBLockingMethods to match classes as
of JDK-11
---
.travis.yml| 1 +
.../results/cpu/StackTraceSnapshotBuilder.java | 6 ++
.../modules/profiler/SampledCPUSnapshotTest.java | 85 +
.../netbeans/modules/profiler/jdk11-sample1.npss | Bin 0 -> 30502 bytes
4 files changed, 92 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index cb35d64a56..d654370c08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -495,6 +495,7 @@ matrix:
- nbbuild/travis/ant.sh $OPTS build
script:
- ant $OPTS -f profiler/profiler.oql test
+- ant $OPTS -f profiler/profiler test-unit
- name: Test webcommon modules
jdk: openjdk8
diff --git
a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java
b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java
index 0f1d3e0d80..2ead829cff 100644
---
a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java
+++
b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java
@@ -77,8 +77,14 @@ public class StackTraceSnapshotBuilder {
new MethodInfo("sun.nio.ch.KQueueArrayWrapper","kevent0[native](int,
long, int, long) : int"), // NOI18N
new
MethodInfo("sun.nio.ch.WindowsSelectorImpl$SubSelector","poll0[native]"), //
NOI18N
new
MethodInfo("sun.nio.ch.WindowsSelectorImpl$SubSelector","poll0[native](long,
int, int[], int[], int[], long) : int"), // NOI18N
+new MethodInfo("sun.nio.ch.EPoll","wait[native]"), // NOI18N
new MethodInfo("java.net.PlainSocketImpl", "socketConnect[native]"),
// NOI18N
new MethodInfo("java.net.PlainSocketImpl",
"socketConnect[native](java.net.InetAddress, int, int) : void"), // NOI18N
+new MethodInfo("java.net.SocketInputStream", "socketRead0[native]"),
// NOI18N
+new MethodInfo("jdk.internal.misc.Unsafe", "park[native]"), // NOI18N
+new MethodInfo("java.lang.ref.Reference",
"waitForReferencePendingList[native]"), // NOI18N
+new MethodInfo("java.io.FileInputStream", "readBytes[native]"), //
NOI18N
+new MethodInfo("sun.management.ThreadImpl", "dumpThreads0[native]"),
// NOI18N
});
private InstrumentationFilter filter;
diff --git
a/profiler/profiler/test/unit/src/org/netbeans/modules/profiler/SampledCPUSnapshotTest.java
b/profiler/profiler/test/unit/src/org/netbeans/modules/profiler/SampledCPUSnapshotTest.java
new file mode 100644
index 00..898b7692ac
--- /dev/null
+++
b/profiler/profiler/test/unit/src/org/netbeans/modules/profiler/SampledCPUSnapshotTest.java
@@ -0,0 +1,85 @@
+/*
+ * 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.profiler;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Map;
+import java.util.TreeMap;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.netbeans.lib.profiler.results.ResultsSnapshot;
+import org.netbeans.lib.profiler.results.cpu.CPUCCTContainer;
+import org.netbeans.lib.profiler.results.cpu.CPUResultsSnapshot;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+
+public
svn commit: r54617 - /dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/
Author: jtulach Date: Wed May 18 21:19:19 2022 New Revision: 54617 Log: NetBeans HTML/Java API 1.8 has been approved Removed: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/ - 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: r54616 - in /release/netbeans/netbeans-html4j: netbeans-html4j-1.7.3/ netbeans-html4j-1.8/ netbeans-html4j-1.8/netbeans-html4j-1.8.zip.asc
Author: jtulach Date: Wed May 18 21:17:24 2022 New Revision: 54616 Log: NetBeans HTML/Java API 1.8 has been approved Added: release/netbeans/netbeans-html4j/netbeans-html4j-1.8/ - copied from r54544, dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/ release/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.asc - copied unchanged from r54556, dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.asc Removed: release/netbeans/netbeans-html4j/netbeans-html4j-1.7.3/ - 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: r54556 - /dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.asc
Author: jtulach Date: Mon May 16 09:11:58 2022 New Revision: 54556 Log: Signing with Jaroslav Tulach (2nd key for signing NetBeans releases) Modified: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.asc Modified: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.asc == --- dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.asc (original) +++ dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.asc Mon May 16 09:11:58 2022 @@ -1,6 +1,16 @@ -BEGIN PGP SIGNATURE- -iF0EABECAB0WIQS8Lzcdq85cO8li6Ky8455lEKG+BAUCYoECKAAKCRC8455lEKG+ -BPNyAJ4ijvNqETsw/MeLoaifT+InmyJvaQCgmS4RiQsgnYTmHFN/bY+zuKm7LRY= -=GWPj +iQIzBAABCgAdFiEETxTvPki77GNgjX6yE1SNfMr66A0FAmKCFScACgkQE1SNfMr6 +6A34Yg//QcgbIKr0oWQ7PwEBHHnvwNiFdVNfb3LY71ZxZQZma9zJul6uisGfwOvy +ECA0ceH8o+qyvFJJ12vJGzM2zJWHXqebc0b6aLVD4hxyG/Q3FrbEytut8MmFuWeI +ue6vo1pwG9D6FoRme28CIHbgAVAVs1o3wVRSJaogRykHKpnXPOke9MV0h4S+K2OA +o1B7Wy7/Lb2oeWTvlROViqsdDt7b8lk8BHC+8Q7Ixw2ny67qW7wMZzBBsJlX2Xyp +X6p578xFHEQtcEOa/9PeBloo4GXJBGpozPj2isFAcb39rU4MGPUUygSwBwPfbjo7 +F1QyO+PRobeJXep+tmd6SoAFT6j1akojUCLEdg7r4sjvNc+bCoI1mZcsFPiR1nNe +Luz6nBH8Voal/ag227dFo1VcaqzWGRICxa4xpNIMIBN0rQR1s6n3Fi+bBODHTCy6 +An5sUfuT0upmS1Z7O4NMQN70ftCYJd2O9Fy30FtepyBVU7B91E2+YcQo/rqG72WP +9O3Em7v+WeDA2+EBq9SrVYIaI67O6R43kbe85LqWdMLnJ6GSyyIaGxVw+On8vkeK +Wdgs8Ff69Cf0bV/In6UvzS7nbFEoMf06I3g7mShy+a5nagidxv3XuJtVU+yxpYED +lDc9//+ap591xN72wGjJPZs23+BDfhkaW9PmUHlTKv6ERN6yUxE= +=mG18 -END PGP SIGNATURE- - 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: r54544 - in /dev/netbeans/netbeans-html4j/netbeans-html4j-1.8: ./ netbeans-html4j-1.8.zip netbeans-html4j-1.8.zip.asc netbeans-html4j-1.8.zip.sha512
Author: jtulach Date: Sun May 15 13:44:26 2022 New Revision: 54544 Log: Preparing HTML/Java API 1.8 for voting Added: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/ dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip (with props) dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.asc dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.sha512 Added: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.asc == --- dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.asc (added) +++ dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.asc Sun May 15 13:44:26 2022 @@ -0,0 +1,6 @@ +-BEGIN PGP SIGNATURE- + +iF0EABECAB0WIQS8Lzcdq85cO8li6Ky8455lEKG+BAUCYoECKAAKCRC8455lEKG+ +BPNyAJ4ijvNqETsw/MeLoaifT+InmyJvaQCgmS4RiQsgnYTmHFN/bY+zuKm7LRY= +=GWPj +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.sha512 == --- dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.sha512 (added) +++ dev/netbeans/netbeans-html4j/netbeans-html4j-1.8/netbeans-html4j-1.8.zip.sha512 Sun May 15 13:44:26 2022 @@ -0,0 +1 @@ +a27af12057a588c2a232b695ef15ee573381a1356a2dcb632008ac4485d36ca7427228684b4e757ecf50231c3d5e23eb92422a9de90338d0233184b79d04626b netbeans-html4j-1.8.zip - 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-html4j] tag release-1.8 created (now acae468d)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to tag release-1.8 in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git at acae468d (commit) No new revisions were added by this update. - 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-html4j] 01/01: Preparing version 1.8
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit acae468d4867a9c4f59d8607909f0f0ef1450dd7
Author: Jaroslav Tulach
AuthorDate: Sun May 15 15:19:59 2022 +0200
Preparing version 1.8
---
boot-agent-test/pom.xml | 2 +-
boot-fx/pom.xml | 4 ++--
boot-script/pom.xml | 4 ++--
boot/pom.xml| 4 ++--
browser/pom.xml | 2 +-
context/pom.xml | 4 ++--
ecj-test/pom.xml| 4 ++--
equinox-agentclass-hook/pom.xml | 2 +-
generic/pom.xml | 4 ++--
geo/pom.xml | 4 ++--
html4j-maven-plugin/pom.xml | 4 ++--
json-tck/pom.xml| 6 +++---
json/pom.xml| 4 ++--
ko-felix-test/pom.xml | 2 +-
ko-osgi-test/pom.xml| 2 +-
ko-ws-tyrus/pom.xml | 4 ++--
ko4j/pom.xml| 4 ++--
pom.xml | 2 +-
renderer/pom.xml| 2 +-
sound/pom.xml | 4 ++--
webkit/pom.xml | 2 +-
xhr4j/pom.xml | 4 ++--
22 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/boot-agent-test/pom.xml b/boot-agent-test/pom.xml
index 54c4e4a4..a7f5480c 100644
--- a/boot-agent-test/pom.xml
+++ b/boot-agent-test/pom.xml
@@ -24,7 +24,7 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8
boot-agent-test
jar
diff --git a/boot-fx/pom.xml b/boot-fx/pom.xml
index 25e510f7..19164975 100644
--- a/boot-fx/pom.xml
+++ b/boot-fx/pom.xml
@@ -24,11 +24,11 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8
org.netbeans.html
net.java.html.boot.fx
- 2.0-SNAPSHOT
+ 1.8
FX WebView Bootstrap
bundle
http://maven.apache.org
diff --git a/boot-script/pom.xml b/boot-script/pom.xml
index 692225b2..edd505b2 100644
--- a/boot-script/pom.xml
+++ b/boot-script/pom.xml
@@ -24,11 +24,11 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8
Presenter via javax.script
net.java.html.boot.script
-2.0-SNAPSHOT
+1.8
bundle
none
diff --git a/boot/pom.xml b/boot/pom.xml
index 19968a5b..15726f26 100644
--- a/boot/pom.xml
+++ b/boot/pom.xml
@@ -24,11 +24,11 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8
org.netbeans.html
net.java.html.boot
- 2.0-SNAPSHOT
+ 1.8
bundle
Browser Bootstrap
http://maven.apache.org
diff --git a/browser/pom.xml b/browser/pom.xml
index 466e044c..091bdeeb 100644
--- a/browser/pom.xml
+++ b/browser/pom.xml
@@ -26,7 +26,7 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8
Browser Presenter
diff --git a/context/pom.xml b/context/pom.xml
index 1f1cc293..29d4543c 100644
--- a/context/pom.xml
+++ b/context/pom.xml
@@ -24,11 +24,11 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8
org.netbeans.html
net.java.html
- 2.0-SNAPSHOT
+ 1.8
bundle
HTML Context
http://maven.apache.org
diff --git a/ecj-test/pom.xml b/ecj-test/pom.xml
index cd2b6059..c37ff957 100644
--- a/ecj-test/pom.xml
+++ b/ecj-test/pom.xml
@@ -24,11 +24,11 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8
org.netbeans.html
ecj-test
- 2.0-SNAPSHOT
+ 1.8
bundle
Testing ecj
http://maven.apache.org
diff --git a/equinox-agentclass-hook/pom.xml b/equinox-agentclass-hook/pom.xml
index 95222475..b33de1e1 100644
--- a/equinox-agentclass-hook/pom.xml
+++ b/equinox-agentclass-hook/pom.xml
@@ -24,7 +24,7 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8
AgentClass Hook for Equinox
equinox-agentclass-hook
diff --git a/generic/pom.xml b/generic/pom.xml
index 670365ff..8f33c365 100644
--- a/generic/pom.xml
+++ b/generic/pom.xml
@@ -24,13 +24,13 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8
generic
Generic ProtoPresenter
bundle
-2.0-SNAPSHOT
+1.8
${project.parent.basedir}
org.netbeans.html.presenters.spi
diff --git a/geo/pom.xml b/geo/pom.xml
index 928ece31..36c82913 100644
--- a/geo/pom.xml
+++ b/geo/pom.xml
@@ -24,11 +24,11 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8
org.netbeans.html
net.java.html.geo
- 2.0-SNAPSHOT
+ 1.8
bundle
Geolocation API
http://maven.apache.org
diff --git a/html4j-maven-plugin/pom.xml b/html4j-maven-plugin/pom.xml
index 7e39a800..ccea9661 100644
--- a/html4j-maven-plugin/pom.xml
+++ b/html4j-maven-plugin/pom.xml
@@ -24,12 +24,12 @@
org.netbeans.html
pom
-2.0-SNAPSHOT
+1.8
maven-plugin
org.netbeans.html
html4j-maven-plugin
- 2.0-SNAPSHOT
+ 1.8
Html for Java Maven Plugin
http://maven.apache.org
Maven plugin
[netbeans-html4j] branch release updated (a2b2e2c1 -> acae468d)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch release in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git omit a2b2e2c1 Preparing version 1.7.3 add 0b2c4e99 Models.react to expose principles of reactive computations add 23642ee2 Re-record the list of observed observables add b22cc741 Re-record list of observables with each new rendering add bab9701a Using bits from NetBeans 13 release add 63465bec Calls made with @JSB.wait4java=false return in instance of Thenable add 37c42af8 Encapsulate cast and to JavaScript conversion into dedicated methods add a2e12542 Merging with master which encapsulated conversions into methods add 53f91355 Turning Promise into microtask and resolving it just before the context closes add 47d90b43 Use real JavaScript Promise when no wait4java add 3c37add5 Skip AsyncJavaTest on Nashorn that doesn't provide Promise add 94f09587 Using wait4java = false in ko4j add 6faac87f Enough to repeat the test for 10s add e69180c4 Separating the copyFrom and regular binding code add bbd0236d Bringing in separated copyFrom and regular observable implementation add 1e398f86 Automatic handling of Interrupted executions with PhaseExecutor add 697878a3 More flexible test with standard handling or interrupted execution add b0241c58 Make sure promise is registered with active presenter add 9f9e34d2 Basic polyfill of Promise for Nashorn add b0ef9759 Fn.activate presenter in the test, so it also gets closed add 94c39fdd Don't wait for Java execution in ko4j bindings add 5c99a907 Activate and close the xhr4j presenter add 5dcd95a0 Javadoc yields unimportant warnings on JDK-17 add a34af389 Initialize Swing and JavaFX prior to starting tests to avoid deadlocks add 6e5b1dea Switching to GitHub Actions for CI add 3f8bba40 Merge pull request #45 from jtulach/Actions add b2f77b01 Bringing in configuration of GitHub Actions add 9b4b3713 Build Javadoc on a JDK that understands instanceof matches add 36a15ce2 Using PhaseExecutor in basic AsyncJavaTest add 1985d30e Better formatting of the generated code add 1021735a Special implementation of the promise method add 4cfb54b2 Handle microtasks on flush of the generic presenter add 6d930012 More descriptive project names add c3ed9adb Nicer formatting add a0a8be7d Use asynchronous PUT when requesting promise evaluation add f6ab8e94 Polishing the Fn.Promise API add c9127e31 Add test for conversion of nested arrays to the TCK add a4fd3f9b Convert arrays recursively in ScriptPresenter add d6fd1228 Merge pull request #46 from rqu/nestedArrays add 1c621447 Merging with master add d8240740 Give the system 10ms pause before retrying the interrupted tasks add ba15fb62 Eliminate numerous errors by offering only try-with-resources activation of a presenter add fa7112c6 Documenting wait4java as a new feature for 1.8 add 8717a54c Using PhaseExecutor for the MinesTest add 0367bae8 Avoid using HashSet and ArrayList add 27235697 Renaming to LaterJavaScriptAction add ba7aafe7 Dispatch flushImpl when no frame is active add 9d79af29 Fixing alignment add 644645a7 Merge pull request #44 from jtulach/jtulach/wait4java add b7ff4120 Bringing up-to-date with master add 48d8a20f A note about Models.react support add 265c53ca Merge pull request #43 from jtulach/jtulach/React add 333650b3 Enforce binary name for inner classes in the @JavaScriptBody callbacks add d9dd994e Copy all the annotation attributes when patching the class file add a39be9d0 Java callback can be executed immediatelly, just then has to be delayed add 013a1185 Search JavaScriptTCK via ServiceProvider add a24e5d7a Avoid usage of ArrayList in the TCK add d06af255 Only fallback to execute when no tcks present add f24abe58 Mergng bugfix of "later" TCK test new acae468d Preparing version 1.8 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a2b2e2c1) \ N -- N -- N refs/heads/release (acae468d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisi
[netbeans-html4j] branch master updated: Only fallback to execute when no tcks present
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new d06af255 Only fallback to execute when no tcks present
new f24abe58 Mergng bugfix of "later" TCK test
d06af255 is described below
commit d06af2555cd9733e5339d9d25a7b2cf7e1dbe3f6
Author: Jaroslav Tulach
AuthorDate: Sun May 15 08:02:15 2022 +0200
Only fallback to execute when no tcks present
---
.../src/main/java/net/java/html/js/tests/JsUtils.java | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/json-tck/src/main/java/net/java/html/js/tests/JsUtils.java
b/json-tck/src/main/java/net/java/html/js/tests/JsUtils.java
index a370f1bf..71bc3a58 100644
--- a/json-tck/src/main/java/net/java/html/js/tests/JsUtils.java
+++ b/json-tck/src/main/java/net/java/html/js/tests/JsUtils.java
@@ -55,13 +55,18 @@ public class JsUtils {
static boolean executeNow(Class clazz, String script) {
try {
-for (JavaScriptTCK j : tcks(clazz)) {
-if (j.executeNow(script)) {
-return true;
+final Iterable tcks = tcks(clazz);
+if (tcks.iterator().hasNext()) {
+for (JavaScriptTCK j : tcks) {
+if (j.executeNow(script)) {
+return true;
+}
}
+return false;
+} else {
+execute(clazz, script);
+return true;
}
-execute(clazz, script);
-return true;
} catch (Exception ex) {
throw raise(RuntimeException.class, ex);
}
-
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-html4j] branch master updated: Avoid usage of ArrayList in the TCK
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new a24e5d7a Avoid usage of ArrayList in the TCK
a24e5d7a is described below
commit a24e5d7a23a8141445e29d85f6c7c95cee127552
Author: Jaroslav Tulach
AuthorDate: Fri May 13 20:36:15 2022 +0200
Avoid usage of ArrayList in the TCK
---
.../src/main/java/net/java/html/json/tests/ObtainAndComputeTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/json-tck/src/main/java/net/java/html/json/tests/ObtainAndComputeTest.java
b/json-tck/src/main/java/net/java/html/json/tests/ObtainAndComputeTest.java
index 76e6e019..3543c1bf 100644
--- a/json-tck/src/main/java/net/java/html/json/tests/ObtainAndComputeTest.java
+++ b/json-tck/src/main/java/net/java/html/json/tests/ObtainAndComputeTest.java
@@ -18,7 +18,6 @@
*/
package net.java.html.json.tests;
-import java.util.ArrayList;
import java.util.List;
import net.java.html.BrwsrCtx;
import net.java.html.json.ComputedProperty;
@@ -98,7 +97,7 @@ public class ObtainAndComputeTest {
static final class ObtainModel {
@ComputedProperty
public static List filteredUsers(List users,
String filter) {
-List res = new ArrayList<>();
+List res = Models.asList();
for (ObtainUser user : users) {
if (user.getEmail().contains(filter)) {
res.add(user);
-
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-html4j] 02/02: Search JavaScriptTCK via ServiceProvider
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit 013a118589c4cc708de48a4873e53953d0a32764
Author: Jaroslav Tulach
AuthorDate: Fri May 13 20:27:26 2022 +0200
Search JavaScriptTCK via ServiceProvider
---
.../main/java/net/java/html/js/tests/JsUtils.java | 27 ++
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/json-tck/src/main/java/net/java/html/js/tests/JsUtils.java
b/json-tck/src/main/java/net/java/html/js/tests/JsUtils.java
index 2a262480..a370f1bf 100644
--- a/json-tck/src/main/java/net/java/html/js/tests/JsUtils.java
+++ b/json-tck/src/main/java/net/java/html/js/tests/JsUtils.java
@@ -19,6 +19,8 @@
package net.java.html.js.tests;
import java.io.StringReader;
+import java.util.ServiceLoader;
+import net.java.html.json.Models;
import org.netbeans.html.boot.spi.Fn;
import org.netbeans.html.json.tck.JavaScriptTCK;
@@ -32,6 +34,20 @@ public class JsUtils {
instantiatedJsTCK = tck;
}
+private static Iterable tcks(Class clazz) {
+if (instantiatedJsTCK != null) {
+return Models.asList(instantiatedJsTCK);
+}
+return ServiceLoader.load(JavaScriptTCK.class, cl(clazz));
+}
+private static ClassLoader cl(Class c) {
+try {
+return c.getClassLoader();
+} catch (SecurityException ex) {
+return null;
+}
+}
+
static void execute(Class clazz, String script) throws Exception {
Fn.Presenter p = Fn.activePresenter();
p.loadScript(new StringReader(script));
@@ -39,12 +55,13 @@ public class JsUtils {
static boolean executeNow(Class clazz, String script) {
try {
-if (instantiatedJsTCK != null) {
-return instantiatedJsTCK.executeNow(script);
-} else {
-execute(clazz, script);
-return true;
+for (JavaScriptTCK j : tcks(clazz)) {
+if (j.executeNow(script)) {
+return true;
+}
}
+execute(clazz, script);
+return true;
} catch (Exception ex) {
throw raise(RuntimeException.class, ex);
}
-
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-html4j] 01/02: Java callback can be executed immediatelly, just then has to be delayed
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit a39be9d0bf05d57bcb04e61073ef3c8bd5c25db7
Author: Jaroslav Tulach
AuthorDate: Fri May 13 20:06:05 2022 +0200
Java callback can be executed immediatelly, just then has to be delayed
---
json-tck/src/main/java/net/java/html/js/tests/AsyncJavaTest.java | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaTest.java
b/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaTest.java
index e3c29776..3abe6797 100644
--- a/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaTest.java
+++ b/json-tck/src/main/java/net/java/html/js/tests/AsyncJavaTest.java
@@ -18,9 +18,7 @@
*/
package net.java.html.js.tests;
-import net.java.html.js.JavaScriptBody;
import static net.java.html.js.tests.JavaScriptBodyTest.assertEquals;
-import static net.java.html.js.tests.JavaScriptBodyTest.assertFalse;
import net.java.html.json.tests.PhaseExecutor;
import org.netbeans.html.json.tck.KOTest;
@@ -32,12 +30,10 @@ public class AsyncJavaTest {
PhaseExecutor.schedule(phases, () -> {
boolean[] javaExecuted = { false };
Object objWithX = AsyncJava.computeInAsyncJava(5, (n) -> {
-javaExecuted[0] = true;
return new Factorial().factorial(n);
}, () -> {});
int initialValue = Bodies.readIntX(objWithX);
-assertFalse(javaExecuted[0], "Java code shall only be called when
the JavaScript ends");
-assertEquals(-1, initialValue, "Promise shall only be resolved
1when the JavaScript ends");
+assertEquals(-1, initialValue, "Promise.then shall only be called
when the code ends");
return objWithX;
}).then((objWithX) -> {
int result = Bodies.readIntX(objWithX);
-
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-html4j] branch master updated (d9dd994e -> 013a1185)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git from d9dd994e Copy all the annotation attributes when patching the class file new a39be9d0 Java callback can be executed immediatelly, just then has to be delayed new 013a1185 Search JavaScriptTCK via ServiceProvider The 2 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/net/java/html/js/tests/AsyncJavaTest.java | 6 + .../main/java/net/java/html/js/tests/JsUtils.java | 27 ++ 2 files changed, 23 insertions(+), 10 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-html4j] branch master updated: Copy all the annotation attributes when patching the class file
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new d9dd994e Copy all the annotation attributes when patching the class
file
d9dd994e is described below
commit d9dd994ed564b216779f89c6b1ec80887e0e1182
Author: Jaroslav Tulach
AuthorDate: Sun May 8 22:23:17 2022 +0200
Copy all the annotation attributes when patching the class file
---
.../java/org/netbeans/html/boot/impl/FnUtils.java | 45 +-
1 file changed, 36 insertions(+), 9 deletions(-)
diff --git a/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java
b/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java
index ca3c6ce4..0071cdd9 100644
--- a/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java
@@ -209,15 +209,26 @@ public final class FnUtils {
varr.visit(null, argName);
}
varr.visitEnd();
-va.visit("javacall", fia.javacall);
va.visit("body", fia.body);
+if (fia.javacall != null) {
+va.visit("javacall", fia.javacall);
+}
+if (fia.wait4js != null) {
+va.visit("wait4js", fia.wait4js);
+}
+if (fia.wait4java != null) {
+va.visit("wait4java", fia.wait4java);
+}
+if (fia.keepAlive != null) {
+va.visit("keepAlive", fia.keepAlive);
+}
va.visitEnd();
}
String body;
List args;
-if (fia.javacall) {
-body = callback(fia.body, !fia.wait4java);
+if ((fia.javacall())) {
+body = callback(fia.body, fia.usePromise());
args = new ArrayList<>(fia.args);
args.add("vm");
} else {
@@ -242,7 +253,7 @@ public final class FnUtils {
// init Fn
super.visitInsn(Opcodes.POP);
super.visitLdcInsn(Type.getObjectType(FindInClass.this.name));
-super.visitInsn(fia.keepAlive ? Opcodes.ICONST_1 :
Opcodes.ICONST_0);
+super.visitInsn(fia.keepAlive() ? Opcodes.ICONST_1 :
Opcodes.ICONST_0);
super.visitLdcInsn(body);
super.visitIntInsn(Opcodes.SIPUSH, args.size());
super.visitTypeInsn(Opcodes.ANEWARRAY, "java/lang/String");
@@ -412,7 +423,7 @@ public final class FnUtils {
FindInMethod.super.visitInsn(Opcodes.AASTORE);
}
-if (fia.wait4js) {
+if (!fia.asyncJavaScript()) {
super.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
"org/netbeans/html/boot/spi/Fn", "invoke",
"(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;"
);
@@ -488,10 +499,10 @@ public final class FnUtils {
List args = new ArrayList<>();
String body;
-boolean javacall = false;
-boolean wait4js = true;
-boolean wait4java = true;
-boolean keepAlive = true;
+Boolean javacall;
+Boolean wait4js;
+Boolean wait4java;
+Boolean keepAlive;
public FindInAnno() {
super(Opcodes.ASM5);
@@ -534,6 +545,22 @@ public final class FnUtils {
generateJSBody(this);
}
}
+
+boolean usePromise() {
+return Boolean.FALSE.equals(wait4java);
+}
+
+boolean javacall() {
+return Boolean.TRUE.equals(javacall);
+}
+
+boolean asyncJavaScript() {
+return Boolean.FALSE.equals(wait4js);
+}
+
+boolean keepAlive() {
+return !Boolean.FALSE.equals(keepAlive);
+}
}
}
-
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-html4j] branch master updated: Enforce binary name for inner classes in the @JavaScriptBody callbacks
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new 333650b3 Enforce binary name for inner classes in the @JavaScriptBody
callbacks
333650b3 is described below
commit 333650b3fbaa3cdbec083f974816e8ae06852ffb
Author: Jaroslav Tulach
AuthorDate: Sun May 8 21:39:02 2022 +0200
Enforce binary name for inner classes in the @JavaScriptBody callbacks
---
.../html/boot/impl/JavaScriptProcesor.java | 41 --
.../java/net/java/html/js/tests/AsyncJava.java | 2 +-
2 files changed, 40 insertions(+), 3 deletions(-)
diff --git
a/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java
b/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java
index 08157278..f8a7cdbb 100644
--- a/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java
@@ -302,7 +302,7 @@ public final class JavaScriptProcesor extends
AbstractProcessor {
} else if (preId == ':') {
int lastAt = userText.lastIndexOf('@', preIdentifierAt + 1);
String maybeClassName = userText.substring(lastAt + 1,
preIdentifierAt - 1);
-TypeElement maybeClass =
processingEnv.getElementUtils().getTypeElement(maybeClassName);
+TypeElement maybeClass = findClass(maybeClassName);
String instanceName = null;
if (lastAt > 0 && userText.charAt(lastAt - 1) == '.') {
instanceName = endsWithIdentifier(userText, lastAt - 1);
@@ -358,6 +358,37 @@ public final class JavaScriptProcesor extends
AbstractProcessor {
return Collections.emptyList();
}
+final TypeElement findClass(String classname) {
+if (classname == null) {
+return null;
+}
+TypeElement clazz =
processingEnv.getElementUtils().getTypeElement(classname);
+if (clazz != null) {
+return clazz;
+}
+int dolar = classname.indexOf('$');
+if (dolar == -1) {
+return null;
+}
+final String parentName = classname.substring(0, dolar);
+TypeElement parent =
processingEnv.getElementUtils().getTypeElement(parentName);
+if (parent != null) {
+String rest = classname.substring(dolar + 1);
+for (Element e : parent.getEnclosedElements()) {
+if (!e.getKind().isClass() && !e.getKind().isInterface()) {
+continue;
+}
+if (rest.equals(e.getSimpleName().toString())) {
+clazz = (TypeElement) e;
+break;
+}
+}
+}
+String binaryClassName = classname.replace('$', '.');
+clazz =
processingEnv.getElementUtils().getTypeElement(binaryClassName);
+return clazz;
+}
+
final void wrongArrayError(TypeMirror paramType, Element method) {
processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Don't
use " + paramType + " array. Use Object[].", method);
}
@@ -385,13 +416,19 @@ public final class JavaScriptProcesor extends
AbstractProcessor {
@Override
protected CharSequence callMethod(String ident, boolean promise,
String fqn, String method, String params) {
-final TypeElement type =
processingEnv.getElementUtils().getTypeElement(fqn);
+final TypeElement type = findClass(fqn);
if (type == null) {
processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
"Callback to non-existing class " + fqn, e
);
return "";
}
+String binName =
processingEnv.getElementUtils().getBinaryName(type).toString();
+if (!fqn.equals(binName)) {
+processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
+"Use binary classname " + binName + " in the callback", e);
+}
+
ExecutableElement found = null;
String paramTypes = null;
StringBuilder foundParams = new StringBuilder();
diff --git a/json-tck/src/main/java/net/java/html/js/tests/AsyncJava.java
b/json-tck/src/main/java/net/java/html/js/tests/AsyncJava.java
index 76e9cad7..42792318 100644
--- a/json-tck/src/main/java/net/java/html/js/tests/AsyncJava.java
+++ b/json-tck/src/main/java/net/java/html/js/tests/AsyncJava.java
@@ -28,7 +28,7 @@ public class AsyncJava {
var result = {
x : -1
};
-var facN = f...@net.java.html.js.tests.asyncjava.fac::fac(I)(n);
+var facN = f...@net.java.html.js.tests.AsyncJava$Fac::
[netbeans-html4j] branch master updated (644645a7 -> 265c53ca)
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
from 644645a7 Merge pull request #44 from jtulach/jtulach/wait4java
new 0b2c4e99 Models.react to expose principles of reactive computations
new 23642ee2 Re-record the list of observed observables
new b22cc741 Re-record list of observables with each new rendering
new b7ff4120 Bringing up-to-date with master
new 48d8a20f A note about Models.react support
new 265c53ca Merge pull request #43 from jtulach/jtulach/React
The 417 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:
json/src/main/java/net/java/html/json/Models.java | 78 +
.../java/org/netbeans/html/json/impl/Reactive.java | 73 +++
.../org/netbeans/html/json/impl/ReactiveTech.java | 68 ++
.../{ClassValueTypes.java => ReactiveType.java}| 39 +--
.../java/net/java/html/json/ReactionChainTest.java | 81 ++
.../test/java/net/java/html/json/ReactionTest.java | 71 +++
src/main/javadoc/overview.html | 4 ++
7 files changed, 381 insertions(+), 33 deletions(-)
create mode 100644 json/src/main/java/org/netbeans/html/json/impl/Reactive.java
create mode 100644
json/src/main/java/org/netbeans/html/json/impl/ReactiveTech.java
copy json/src/main/java/org/netbeans/html/json/impl/{ClassValueTypes.java =>
ReactiveType.java} (50%)
create mode 100644 json/src/test/java/net/java/html/json/ReactionChainTest.java
create mode 100644 json/src/test/java/net/java/html/json/ReactionTest.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
[netbeans-html4j] branch master updated (d6fd1228 -> 644645a7)
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
from d6fd1228 Merge pull request #46 from rqu/nestedArrays
new 63465bec Calls made with @JSB.wait4java=false return in instance of
Thenable
new a2e12542 Merging with master which encapsulated conversions into
methods
new 53f91355 Turning Promise into microtask and resolving it just before
the context closes
new 47d90b43 Use real JavaScript Promise when no wait4java
new 3c37add5 Skip AsyncJavaTest on Nashorn that doesn't provide Promise
new 94f09587 Using wait4java = false in ko4j
new bbd0236d Bringing in separated copyFrom and regular observable
implementation
new 697878a3 More flexible test with standard handling or interrupted
execution
new b0241c58 Make sure promise is registered with active presenter
new 9f9e34d2 Basic polyfill of Promise for Nashorn
new b0ef9759 Fn.activate presenter in the test, so it also gets closed
new 94c39fdd Don't wait for Java execution in ko4j bindings
new 5c99a907 Activate and close the xhr4j presenter
new b2f77b01 Bringing in configuration of GitHub Actions
new 9b4b3713 Build Javadoc on a JDK that understands instanceof matches
new 36a15ce2 Using PhaseExecutor in basic AsyncJavaTest
new 1985d30e Better formatting of the generated code
new 1021735a Special implementation of the promise method
new 4cfb54b2 Handle microtasks on flush of the generic presenter
new 6d930012 More descriptive project names
new c3ed9adb Nicer formatting
new a0a8be7d Use asynchronous PUT when requesting promise evaluation
new f6ab8e94 Polishing the Fn.Promise API
new 1c621447 Merging with master
new d8240740 Give the system 10ms pause before retrying the interrupted
tasks
new ba15fb62 Eliminate numerous errors by offering only try-with-resources
activation of a presenter
new fa7112c6 Documenting wait4java as a new feature for 1.8
new 8717a54c Using PhaseExecutor for the MinesTest
new 0367bae8 Avoid using HashSet and ArrayList
new 27235697 Renaming to LaterJavaScriptAction
new ba7aafe7 Dispatch flushImpl when no frame is active
new 9d79af29 Fixing alignment
new 644645a7 Merge pull request #44 from jtulach/jtulach/wait4java
The 411 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:
.github/workflows/javadoc.yml | 4 +-
.../java/org/netbeans/html/bootagent/KOFx.java | 4 +-
.../test/java/org/netbeans/html/boot/fx/KOFx.java | 20 ++-
boot-script/pom.xml| 4 +-
.../net/java/html/boot/script/ScriptPresenter.java | 29 ++--
.../html/boot/script/impl/PromisePolyfill.java | 55 +++
.../java/html/boot/script/impl/promisePolyfill.js | 60
.../java/net/java/html/boot/script/KOCase.java | 10 +-
.../java/html/boot/script/ScriptEngineCase.java| 42 --
.../java/html/boot/script/ScriptEngineTest.java| 1 +
.../java/net/java/html/boot/BrowserBuilder.java| 15 +-
.../main/java/net/java/html/js/JavaScriptBody.java | 24 +++
.../org/netbeans/html/boot/impl/FnContext.java | 118 ---
.../java/org/netbeans/html/boot/impl/FnUtils.java | 27 ++--
.../html/boot/impl/JavaScriptProcesor.java | 53 ---
.../org/netbeans/html/boot/impl/JsCallback.java| 9 +-
.../main/java/org/netbeans/html/boot/spi/Fn.java | 107 ++
.../html/boot/impl/CountFnCreationTest.java| 7 +-
.../java/org/netbeans/html/boot/impl/FnTest.java | 20 ++-
.../netbeans/html/boot/impl/JsCallbackTest.java| 4 +-
.../netbeans/html/boot/impl/JsClassLoaderBase.java | 5 +-
.../netbeans/html/boot/impl/JsClassLoaderTest.java | 14 +-
browser/pom.xml| 2 +-
.../netbeans/html/presenters/browser/Browser.java | 4 +-
.../presenters/browser/JavaScriptUtilities.java| 8 +-
ecj-test/pom.xml | 6 +
generic/pom.xml| 2 +-
.../org/netbeans/html/presenters/spi/Generic.java | 164 +
.../html/js/tests/{Later.java => AsyncJava.java} | 35 +++--
.../java/html/js/tests/AsyncJavaScriptAction.java | 122 ---
.../java/net/java/html/js/tests/AsyncJavaTest.java | 63
.../main/java/net/java/html/js/tests/Bodies.java | 18 +--
.../net/java/html/js/tests/JavaScriptBodyTest.java | 8 +-
...criptAction.java => LaterJavaScriptAction.java} | 17 +--
.../net/java/html/json/tests/KnockoutTest.java | 4 +-
.../java/net/java/html/json/tests/MinesTest.java | 36 ++---
.
[netbeans] branch master updated (5a49cd36ba -> 9a2eeb5686)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 5a49cd36ba Merge pull request #3902 from lbownik/lbownik-dev new 7846938344 Action to create a method breakpoint on a stackframe new 8787bbac32 Request org.openide.dialogs with DialogDisplayer.notifyFuture new 9a2eeb5686 Merge pull request #3949 from jtulach/jtulach/AddStackframeBreakpoint The 6942 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/debugger.jpda.ui/nbproject/project.properties | 4 +- java/debugger.jpda.ui/nbproject/project.xml| 2 +- .../jpda/ui/models/CallStackActionsProvider.java | 12 ++-- .../jpda/ui/models/DebuggingActionsProvider.java | 78 +++--- 4 files changed, 80 insertions(+), 16 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 (3863c3d7ec -> 0a42f4e6e8)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 3863c3d7ec Merge pull request #3940 from junichi11/php81-enumerations new e53d785c00 Extract and display original file name from disassembled .class new c21f01afb8 Only search remaining part of the text new 0a42f4e6e8 Merge pull request #3951 from jtulach/jtulach/SourceFileName The 6883 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/classfile/AttachSourcePanel.form | 6 +- .../modules/java/classfile/AttachSourcePanel.java | 8 ++- .../modules/java/classfile/Bundle.properties | 2 +- .../modules/java/classfile/CodeGenerator.java | 21 +-- .../modules/java/classfile/SideBarFactoryImpl.java | 15 +++-- .../modules/java/classfile/CodeGeneratorTest.java | 64 -- 6 files changed, 72 insertions(+), 44 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 (93db1c4 -> 097bb23)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 93db1c4 GroovyVirtualSourceProvider should run GroovyParser in 'indexing' mode. (#3859) new ff6fb43 Source level 15 and text blocks shall be supported regardless of the JDK NetBeans run on new 2a988bb Enable testing of java.source module new fc1e300 Use --release instead of downgrading the source level new 0cb94f1 Minimum support release is 7 new 814d02d Use com.sun.tools.javac.code.Source to compare source levels new b5c21d0 Bringing the fix and the test together new a4fdca2 Keep the warning about missing classes, but remove the change level notice new fdea3e5 Being more conservative when computing useRelease new 2a26dc1 Merging with nb-javac@18 new 097bb23 Merge pull request #3715 from jtulach/jtulach/UseReleaseInsteadOfDowngrading The 6830 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 +- .../modules/java/source/parsing/JavacParser.java | 48 ++ .../api/java/source/MockSourceLevelQuery.java | 69 .../api/java/source/TextBlocksOnAnyJavaTest.java | 76 ++ 4 files changed, 181 insertions(+), 15 deletions(-) create mode 100644 java/java.source/test/unit/src/org/netbeans/api/java/source/MockSourceLevelQuery.java create mode 100644 java/java.source/test/unit/src/org/netbeans/api/java/source/TextBlocksOnAnyJavaTest.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
[netbeans-html4j] branch master updated (3f8bba4 -> d6fd122)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git. from 3f8bba4 Merge pull request #45 from jtulach/Actions new c9127e3 Add test for conversion of nested arrays to the TCK new a4fd3f9 Convert arrays recursively in ScriptPresenter new d6fd122 Merge pull request #46 from rqu/nestedArrays The 378 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: .../src/main/java/net/java/html/boot/script/ScriptPresenter.java | 3 +++ boot/src/test/java/org/netbeans/html/boot/impl/JsUtils.java | 3 +++ json-tck/src/main/java/net/java/html/js/tests/Bodies.java| 3 +++ .../src/main/java/net/java/html/js/tests/JavaScriptBodyTest.java | 9 + 4 files changed, 18 insertions(+) - 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-html4j] branch master updated (1e398f8 -> 3f8bba4)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git. from 1e398f8 Automatic handling of Interrupted executions with PhaseExecutor new 5dcd95a Javadoc yields unimportant warnings on JDK-17 new a34af38 Initialize Swing and JavaFX prior to starting tests to avoid deadlocks new 6e5b1de Switching to GitHub Actions for CI new 3f8bba4 Merge pull request #45 from jtulach/Actions The 375 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: .../workflows/javadoc.yml | 36 --- .../workflows/linux.yml| 36 --- .../Bundle.properties => .github/workflows/mac.yml | 36 --- .../workflows/windows.yml | 36 --- .travis.yml| 71 -- README.md | 5 +- .../org/netbeans/html/ko4j/DoubleViewTest.java | 39 pom.xml| 14 - 8 files changed, 167 insertions(+), 106 deletions(-) copy boot-fx/src/main/resources/org/netbeans/html/boot/fx/Bundle.properties => .github/workflows/javadoc.yml (58%) copy boot-fx/src/main/resources/org/netbeans/html/boot/fx/Bundle.properties => .github/workflows/linux.yml (55%) copy boot-fx/src/main/resources/org/netbeans/html/boot/fx/Bundle.properties => .github/workflows/mac.yml (57%) copy boot-fx/src/main/resources/org/netbeans/html/boot/fx/Bundle.properties => .github/workflows/windows.yml (56%) delete mode 100644 .travis.yml - 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-html4j] branch master updated: Automatic handling of Interrupted executions with PhaseExecutor
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new 1e398f8 Automatic handling of Interrupted executions with
PhaseExecutor
1e398f8 is described below
commit 1e398f86e740ba4aebef9457e0bea2dadf651b56
Author: Jaroslav Tulach
AuthorDate: Tue Mar 22 18:35:46 2022 +0100
Automatic handling of Interrupted executions with PhaseExecutor
---
.../net/java/html/json/tests/GCKnockoutTest.java | 59 +-
.../java/net/java/html/json/tests/JSONTest.java| 438 ++---
.../net/java/html/json/tests/KnockoutTest.java | 694 +++--
.../java/html/json/tests/ObtainAndComputeTest.java | 77 ++-
.../net/java/html/json/tests/PhaseExecutor.java| 111
.../main/java/net/java/html/json/tests/Utils.java | 2 +-
6 files changed, 780 insertions(+), 601 deletions(-)
diff --git
a/json-tck/src/main/java/net/java/html/json/tests/GCKnockoutTest.java
b/json-tck/src/main/java/net/java/html/json/tests/GCKnockoutTest.java
index 4024c57..527e4e9 100644
--- a/json-tck/src/main/java/net/java/html/json/tests/GCKnockoutTest.java
+++ b/json-tck/src/main/java/net/java/html/json/tests/GCKnockoutTest.java
@@ -31,6 +31,8 @@ import static net.java.html.json.tests.Utils.assertEquals;
@Property(name = "all", type = Fullname.class, array = true)
})
public class GCKnockoutTest {
+private final PhaseExecutor[] phases = { null };
+
@Model(className = "Fullname", properties = {
@Property(name = "firstName", type = String.class),
@Property(name = "lastName", type = String.class)
@@ -38,42 +40,55 @@ public class GCKnockoutTest {
static class FullnameCntrl {
}
-@KOTest public void noLongerNeededArrayElementsCanDisappear() throws
Exception {
-BrwsrCtx ctx = Utils.newContext(GCKnockoutTest.class);
-Object exp = Utils.exposeHTML(GCKnockoutTest.class, """
-
-
-
-""");
-try {
+class Data {
+GC m;
+BrwsrCtx ctx;
+Fullname removed;
+
+Data(GC m, BrwsrCtx ctx) {
+this.m = m;
+this.ctx = ctx;
+}
+}
+
+@KOTest
+public void noLongerNeededArrayElementsCanDisappear() throws Exception {
+PhaseExecutor.schedule(phases, () -> {
+BrwsrCtx ctx = Utils.newContext(GCKnockoutTest.class);
+Object exp = Utils.exposeHTML(GCKnockoutTest.class, """
+
+
+
+""");
GC m = Models.bind(new GC(), ctx);
m.getAll().add(Models.bind(new Fullname("Jarda", "Tulach"), ctx));
Models.applyBindings(m);
-
+return new Data(m, ctx);
+}).then((data) -> {
int cnt = Utils.countChildren(GCKnockoutTest.class, "ul");
assertEquals(cnt, 1, "One child, but was " + cnt);
-m.getAll().add(Models.bind(new Fullname("HTML", "Java"), ctx));
-
-cnt = Utils.countChildren(GCKnockoutTest.class, "ul");
+var m = data.m;
+m.getAll().add(Models.bind(new Fullname("HTML", "Java"),
data.ctx));
+}).then((data) -> {
+int cnt = Utils.countChildren(GCKnockoutTest.class, "ul");
assertEquals(cnt, 2, "Now two " + cnt);
-Fullname removed = m.getAll().remove(0);
-
-cnt = Utils.countChildren(GCKnockoutTest.class, "ul");
+data.removed = data.m.getAll().remove(0);
+}).then((data) -> {
+var cnt = Utils.countChildren(GCKnockoutTest.class, "ul");
assertEquals(cnt, 1, "Again One " + cnt);
-Reference ref = new WeakReference(removed);
-removed = null;
+Reference ref = new WeakReference(data.removed);
+data.removed = null;
assertGC(ref, "Can removed object disappear?");
-ref = new WeakReference(m);
-m = null;
+ref = new WeakReference(data.m);
+data.m = null;
assertNotGC(ref, "Root model cannot GC");
-} finally {
+}).finalize((data) -> {
Utils.exposeHTML(GCKnockoutTest.class, "");
-}
-
+}).start();
}
private void assertGC(Reference ref, String msg) throws Exception {
diff --git a/json-tck/src/main/java/net/java/h
[netbeans-html4j] branch master updated (37c42af -> e69180c)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git. from 37c42af Encapsulate cast and to JavaScript conversion into dedicated methods new 6faac87 Enough to repeat the test for 10s new e69180c Separating the copyFrom and regular binding code The 2 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: .../main/java/org/netbeans/html/ko4j/Knockout.java | 75 +++--- .../src/test/java/org/netbeans/html/ko4j/KOFx.java | 2 +- 2 files changed, 52 insertions(+), 25 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-html4j] 02/02: Separating the copyFrom and regular binding code
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit e69180c478a2841634bbf148bbcbeb76418a83ba
Author: Jaroslav Tulach
AuthorDate: Wed Mar 16 05:54:04 2022 +0100
Separating the copyFrom and regular binding code
---
.../main/java/org/netbeans/html/ko4j/Knockout.java | 75 +++---
1 file changed, 51 insertions(+), 24 deletions(-)
diff --git a/ko4j/src/main/java/org/netbeans/html/ko4j/Knockout.java
b/ko4j/src/main/java/org/netbeans/html/ko4j/Knockout.java
index 47bdf7c..12f15e9 100644
--- a/ko4j/src/main/java/org/netbeans/html/ko4j/Knockout.java
+++ b/ko4j/src/main/java/org/netbeans/html/ko4j/Knockout.java
@@ -247,17 +247,44 @@ final class Knockout {
"""
Object.defineProperty(ret, 'ko4j', { value : thiz });
function normalValue(r) {
-if (r) try { var br = r.valueOf(); } catch (err) {}
+if (r) {
+ try {
+var br = r.valueOf();
+ } catch (err) {
+ }
+}
return br === undefined ? r: br;
}
+ function koCopyFrom(index, name, readOnly, orig) {
+var bnd = {
+ 'read': function() {
+var r = orig();
+return normalValue(r);;
+ },
+ 'owner': ret
+};
+if (!readOnly) {
+ function write(val) {
+orig(val);
+var self = ret['ko4j'];
+if (!self) {
+return;
+}
+var model = val ? val['ko4j'] : null;
+
se...@org.netbeans.html.ko4j.Knockout::setValue(ILjava/lang/Object;)(index,
model ? model : val);
+ }
+ bnd['write'] = write;
+ write(orig());
+ orig.subscribe(write);
+};
+var cmpt = ko['computed'](bnd);
+cmpt['valueHasMutated'] = function(val) {
+ orig(val);
+};
+ret[name] = cmpt;
+ }
function koComputed(index, name, readOnly, value) {
-var orig = copyFrom ? copyFrom[name] : null;
-if (!ko['isObservable'](orig)) {
- orig = null;
- var trigger = ko['observable']()['extend']({'notify':'always'});
-} else {
- var trigger = orig;
-}
+var trigger = ko['observable']()['extend']({'notify':'always'});
function realGetter() {
var self = ret['ko4j'];
try {
@@ -267,33 +294,24 @@ final class Knockout {
alert("Cannot call getValue on " + self + " prop: " + name + "
error: " + e);
}
}
-var activeGetter = orig ? orig : function() { return value; };
+var activeGetter = function() { return value; };
var bnd = {
'read': function() {
trigger();
-if (orig) {
- var r = orig();
-} else {
- var r = activeGetter();
- activeGetter = realGetter;
-}
+var r = activeGetter();
+activeGetter = realGetter;
return normalValue(r);;
},
'owner': ret
};
if (!readOnly) {
function write(val) {
-if (orig) orig(val);
var self = ret['ko4j'];
if (!self) return;
var model = val ? val['ko4j'] : null;
se...@org.netbeans.html.ko4j.Knockout::setValue(ILjava/lang/Object;)(index,
model ? model : val);
};
bnd['write'] = write;
- if (orig) {
-write(orig());
-orig.subscribe(write);
- }
};
var cmpt = ko['computed'](bnd);
cmpt['valueHasMutated'] = function(val) {
@@ -303,10 +321,19 @@ final class Knockout {
ret[name] = cmpt;
}
for (var i = 0; i < propNames.length; i++) {
-if ((propInfo[i] & 2) !== 0) {
- ret[propNames[i]] = normalValue(propValues[i]);
+var pName= propNames[i];
+var isConstant = (propInfo[i] & 2) !== 0;
+var isReadOnly = (propInfo[i] & 1) !== 0;
+
+if (isConstant) {
+ ret[pName] = normalValue(propValues[i]);
} else {
- koComputed(i, propNames[i], (propInfo[i] & 1) !== 0,
propValues[i]);
+ var orig = copyFrom ? copyFrom[pName] : null;
+ if (ko['isObservable'](orig)) {
+koCopyFrom(i, pName, isReadOnly, orig);
+ } else
[netbeans-html4j] 01/02: Enough to repeat the test for 10s
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
commit 6faac87f10ce209efa027dd633723cfc5ebda82b
Author: Jaroslav Tulach
AuthorDate: Wed Mar 16 05:53:29 2022 +0100
Enough to repeat the test for 10s
---
ko4j/src/test/java/org/netbeans/html/ko4j/KOFx.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ko4j/src/test/java/org/netbeans/html/ko4j/KOFx.java
b/ko4j/src/test/java/org/netbeans/html/ko4j/KOFx.java
index 989705f..eceee3b 100644
--- a/ko4j/src/test/java/org/netbeans/html/ko4j/KOFx.java
+++ b/ko4j/src/test/java/org/netbeans/html/ko4j/KOFx.java
@@ -78,7 +78,7 @@ public final class KOFx implements ITest, Runnable {
} catch (InvocationTargetException ex) {
Throwable r = ex.getTargetException();
if (r instanceof InterruptedException) {
-if (count++ < 1) {
+if (count++ < 100) {
notify = false;
try {
Thread.sleep(100);
-
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 (e57e09c -> 4e113ed)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from e57e09c Merge pull request #3727 from oyarzun/php-paths-workflow new ffa50da Explicitly expose JPDA classes and compile with --release 8 argument new 880bef3 Copy out needed JVM stat classes and use --release 8 argument new 273e70f Use JDK-11 for compilation on Travis jobs. Test on currently specified JDKs. new 4e113ed Merge pull request #3744 from JaroslavTulach/jtulach/TravisBuildsWithJdk11 The 6746 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| 117 +++-- java/api.debugger.jpda/build.xml | 32 ++ .../api.debugger.jpda/nbproject/project.properties | 4 +- java/debugger.jpda.truffle/build.xml | 6 ++ .../nbproject/project.properties | 3 +- java/debugger.jpda/build.xml | 107 ++- java/debugger.jpda/nbproject/project.properties| 3 +- java/spi.debugger.jpda.ui/build.xml| 11 ++ .../nbproject/project.properties | 3 +- nbbuild/travis/ant.sh | 60 +++ profiler/lib.profiler/build.xml| 14 +++ profiler/lib.profiler/nbproject/project.properties | 5 +- .../org/netbeans/lib/profiler/jps/JpsProxy.java| 7 +- 13 files changed, 304 insertions(+), 68 deletions(-) create mode 100755 nbbuild/travis/ant.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
[netbeans-html4j] branch master updated: Encapsulate cast and to JavaScript conversion into dedicated methods
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git
The following commit(s) were added to refs/heads/master by this push:
new 37c42af Encapsulate cast and to JavaScript conversion into dedicated
methods
37c42af is described below
commit 37c42af80992e56708808bf3016f228d718a68ef
Author: Jaroslav Tulach
AuthorDate: Mon Mar 7 04:41:40 2022 +0100
Encapsulate cast and to JavaScript conversion into dedicated methods
---
.../html/boot/impl/JavaScriptProcesor.java | 184 +++--
1 file changed, 94 insertions(+), 90 deletions(-)
diff --git
a/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java
b/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java
index 01d8c22..1ecdc85 100644
--- a/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java
+++ b/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java
@@ -50,6 +50,7 @@ import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.type.ArrayType;
import javax.lang.model.type.ExecutableType;
+import javax.lang.model.type.PrimitiveType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.Types;
@@ -66,14 +67,15 @@ import org.openide.util.lookup.ServiceProvider;
*/
@ServiceProvider(service = Processor.class)
public final class JavaScriptProcesor extends AbstractProcessor {
-private final Map> javacalls =
-new HashMap>();
-private final Map> bodies =
-new HashMap>();
+private final Map> javacalls = new
HashMap<>();
+private final Map> bodies = new HashMap<>();
+
+public JavaScriptProcesor() {
+}
@Override
public Set getSupportedAnnotationTypes() {
-Set set = new HashSet();
+Set set = new HashSet<>();
set.add(JavaScriptBody.class.getName());
set.add(JavaScriptResource.class.getName());
set.add(JavaScriptResource.Group.class.getName());
@@ -82,11 +84,7 @@ public final class JavaScriptProcesor extends
AbstractProcessor {
@Override
public SourceVersion getSupportedSourceVersion() {
-try {
-return SourceVersion.valueOf("RELEASE_8"); // NOI18N
-} catch (IllegalArgumentException ex) {
-return SourceVersion.RELEASE_7;
-}
+return SourceVersion.latest();
}
@Override
@@ -105,7 +103,7 @@ public final class JavaScriptProcesor extends
AbstractProcessor {
} else {
Set classes = this.bodies.get(findPkg(e));
if (classes == null) {
-classes = new HashSet();
+classes = new HashSet<>();
bodies.put(findPkg(e), classes);
}
Element t = e.getEnclosingElement();
@@ -424,7 +422,7 @@ public final class JavaScriptProcesor extends
AbstractProcessor {
} else {
Map mangledOnes =
javacalls.get(findPkg(e));
if (mangledOnes == null) {
-mangledOnes = new TreeMap();
+mangledOnes = new TreeMap<>();
javacalls.put(findPkg(e), mangledOnes);
}
String mangled = JsCallback.mangle(fqn, method, paramTypes);
@@ -457,34 +455,31 @@ public final class JavaScriptProcesor extends
AbstractProcessor {
FileObject all = processingEnv.getFiler().createResource(
StandardLocation.CLASS_OUTPUT, "",
"META-INF/net.java.html.js.classes"
);
-PrintWriter wAll = new PrintWriter(new OutputStreamWriter(
+try (PrintWriter wAll = new PrintWriter(new OutputStreamWriter(
all.openOutputStream(), "UTF-8"
-));
-for (Map.Entry> entry :
bodies.entrySet()) {
-String pkg = entry.getKey();
-Set classes = entry.getValue();
-
-FileObject out = processingEnv.getFiler().createResource(
-StandardLocation.CLASS_OUTPUT, pkg,
"net.java.html.js.classes",
-classes.iterator().next()
-);
-OutputStream os = out.openOutputStream();
-try {
-PrintWriter w = new PrintWriter(new OutputStreamWriter(os,
"UTF-8"));
-for (TypeElement type : classes) {
-final Name bn =
processingEnv.getElementUtils().getBinaryName(type);
-w.println(bn);
-wAll.println(bn);
+))) {
+for (Map.Entry> entry :
bodies.entrySet()) {
+String pkg = entry.getKey();
+
[netbeans-html4j] branch master updated: Using bits from NetBeans 13 release
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git The following commit(s) were added to refs/heads/master by this push: new bab9701 Using bits from NetBeans 13 release bab9701 is described below commit bab9701a0b3639c1ce94253b9d007787b02baa78 Author: Jaroslav Tulach AuthorDate: Sun Mar 6 06:31:37 2022 +0100 Using bits from NetBeans 13 release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b9b0ae..2cc56af 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 - RELEASE125 + RELEASE130 21.3.0 2.3.8 COPYING - 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-website] branch master updated: Remove Upcoming events paragraph as the events already happened
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/master by this push: new 9776e00 Remove Upcoming events paragraph as the events already happened new 6245a1b Merge pull request #586 from jhorvath/clean-upcoming 9776e00 is described below commit 9776e0056cbefd5fb7b4adaa0958046c988a27eb Author: Jan Horvath AuthorDate: Wed Feb 9 22:57:51 2022 +0100 Remove Upcoming events paragraph as the events already happened --- .../src/content/community/events.asciidoc | 18 +++--- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/netbeans.apache.org/src/content/community/events.asciidoc b/netbeans.apache.org/src/content/community/events.asciidoc index 9b012db..65b6713 100644 --- a/netbeans.apache.org/src/content/community/events.asciidoc +++ b/netbeans.apache.org/src/content/community/events.asciidoc @@ -37,22 +37,10 @@ An "Apache NetBeans Day" is a class of event that happens regularly, with a clea For publicizing NetBeans events, the Apache News posts at https://blogs.apache.org/foundation/ can mention those events, best is to contact pr...@apache.org for that. Apache has an Event Listing (https://events.apache.org/), that we'd also like to make use of. -=== Upcoming NetBeans related events in 2019/2020 - -16-19th September 2019 Oracle CodeOne conference is Oracle's big developer conference for Java and other languages. You have to pay to attend but there are lots of excellent talks. It takes place at the Moscone Center in San Francisco, USA. link:https://www.oracle.com/code-one/[CodeOne Website] Here are the NetBeans related talks link:https://events.rainfocus.com/widget/oracle/oow19/catalogcodeone19?search=netbeans[NetBeans specific talks] - -27th September 2019 Apache NetBeans Day 2019 UK is a free one day conference in London, UK. link:https://www.eventbrite.co.uk/e/apache-netbeans-day-2019-uk-tickets-56803479737[free tickets and more details] - -10th January 2020 Dawscon is a one day software development conference in Montreal, Canada. It will have several NetBeans enthusiastists speaking and at least one dedicated NetBeans talk. link:https://www.dawsoncollege.qc.ca/dawscon/ - -This is a link to the next Apache Community major events: - -[caption="Apache Current Event", link=https://www.apache.org/events/current-event.html] -image::https://www.apache.org/events/current-event-234x60.png[CurrentEvent,234,60] - == Past NetBeans related events -link:https://www.omnijava.com/2019/01/20/dawscon-2019/[Dawscon 2019 write-up] -link:https://blog.idrsolutions.com/2018/04/key-takeaways-from-apache-netbeans-day-uk/[My Key Takeaways from Apache NetBeans Day UK 2018] +- link:https://www.youtube.com/watch?v=ivPjmsSS8iU/[Dawscon 2021 - Everyday coding in NetBeans] +- link:https://www.omnijava.com/2019/01/20/dawscon-2019/[Dawscon 2019 write-up] +- link:https://blog.idrsolutions.com/2018/04/key-takeaways-from-apache-netbeans-day-uk/[My Key Takeaways from Apache NetBeans Day UK 2018] == Apache Software Foundation Resources For Events And Conferences - 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: Adding vscode icons for OCI explorer
This is an automated email from the ASF dual-hosted git repository.
jtulach 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 54e35e3 Adding vscode icons for OCI explorer
new bee5e55 Merge pull request #3569 from jhorvath/oci-icons1
54e35e3 is described below
commit 54e35e33f0df295d4b6f9c397901f15968c2fdbf
Author: Jan Horvath
AuthorDate: Tue Feb 8 16:03:15 2022 +0100
Adding vscode icons for OCI explorer
---
.../modules/cloud/oracle/resources/compartment.svg | 133
.../modules/cloud/oracle/resources/database.svg| 134 +
2 files changed, 267 insertions(+)
diff --git
a/java/java.lsp.server/nbcode/branding/modules/org-netbeans-modules-cloud-oracle.jar/org/netbeans/modules/cloud/oracle/resources/compartment.svg
b/java/java.lsp.server/nbcode/branding/modules/org-netbeans-modules-cloud-oracle.jar/org/netbeans/modules/cloud/oracle/resources/compartment.svg
new file mode 100644
index 000..50f63c2
--- /dev/null
+++
b/java/java.lsp.server/nbcode/branding/modules/org-netbeans-modules-cloud-oracle.jar/org/netbeans/modules/cloud/oracle/resources/compartment.svg
@@ -0,0 +1,133 @@
+
+
+
+http://www.inkscape.org/namespaces/inkscape;
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
+ xmlns="http://www.w3.org/2000/svg;
+ xmlns:svg="http://www.w3.org/2000/svg;>
+
+ .st0{fill:#FF;}
+ .st1{opacity:0.25;}
+ .st2{fill:#FAFAFA;}
+ .st3{opacity:0.33;}
+ .st4{fill:none;stroke:#474747;stroke-miterlimit:10;}
+ .st5{opacity:0.42;}
+ .st6{fill:#CAE3FF;}
+ .st7{opacity:0.2;}
+ .st8{opacity:0.03;}
+ .st9{opacity:0.1;}
+ .st10{opacity:0.15;}
+ .st11{opacity:0.45;}
+ .st12{fill:#FFE1B0;}
+ .st13{fill:#B3DBFF;}
+ .st14{fill:#FBDC7C;}
+ .st15{fill:#FFDB43;}
+ .st16{fill:#E79B00;}
+ .st17{fill:#3883CE;}
+ .st18{fill:none;stroke:#003399;stroke-width:1.375;stroke-miterlimit:10;}
+ .st19{fill:#E8513D;}
+ .st20{fill:#1E1E1E;}
+ .st21{fill:#FFC36D;}
+ .st22{fill:#9FCBFF;}
+ .st23{fill:#E9F7FF;}
+ .st24{fill:#62707C;}
+ .st25{fill:#7A8896;}
+ .st26{fill:#57BFFF;}
+ .st27{fill:#E69D35;}
+ .st28{fill:#9CFF73;}
+ .st29{fill:#4891CC;}
+ .st30{fill:#474747;}
+ .st31{fill:#CCA05E;}
+ .st32{opacity:0.67;}
+ .st33{opacity:0.3;}
+ .st34{fill:#EAEAEA;}
+ .st35{fill:#FFE945;}
+ .st36{fill:#FFCF8C;}
+ .st37{fill:#FF5252;}
+ .st38{opacity:0.12;}
+ .st39{fill:#45A5F4;}
+ .st40{fill:url(#SVGID_1_);}
+ .st41{fill:url(#SVGID_2_);}
+ .st42{opacity:0.05;}
+ .st43{fill:#3D81F5;}
+ .st44{fill:#CECECE;}
+ .st45{fill:#B5B5B5;}
+ .st46{opacity:0.4;}
+ .st47{fill:#595959;}
+ .st48{fill:#80FF80;}
+ .st49{fill:#C8FF80;}
+ .st50{fill:#FFEE80;}
+ .st51{fill:#FFA680;}
+ .st52{fill:#FF8080;}
+ .st53{fill:none;}
+ .st54{fill:#007AFF;}
+ .st55{fill:#EFFF78;}
+ .st56{fill:#FFDA00;}
+ .st57{fill:#3EADFF;}
+ .st58{opacity:0.67;fill:#FF;}
+ .st59{fill:#2E92FF;}
+ .st60{fill:#3AEA00;}
+ .st61{fill:#303030;}
+
+
+
+
diff --git
a/java/java.lsp.server/nbcode/branding/modules/org-netbeans-modules-cloud-oracle.jar/org/netbeans/modules/cloud/oracle/resources/database.svg
b/java/java.lsp.server/nbcode/branding/modules/org-netbeans-modules-cloud-oracle.jar/org/netbeans/modules/cloud/oracle/resources/database.svg
new file mode 100644
index 000..711f2af
--- /dev/null
+++
b/java/java.lsp.server/nbcode/branding/modules/org-netbeans-modules-cloud-oracle.jar/org/netbeans/modules/cloud/oracle/resources/database.svg
@@ -0,0 +1,134 @@
+
+
+
+http://www.inkscape.org/namespaces/inkscape;
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
+ xmlns="http://www.w3.org/2000/svg;
+ xmlns:svg="http://www.w3.org/2000/svg;>
+
+ .st0{fill:#FF;}
+ .st1{opacity:0.25;}
+ .st2{fill:#FAFAFA;}
+ .st3{opacity:0.33;}
+ .st4{fill:none;stroke:#474747;stroke-miterlimit:10;}
+ .st5{opacity:0.42;}
+ .st6{fill:#CAE3FF;}
+ .st7{opacity:0.2;}
+ .st8{opacity:0.03;}
+ .st9{opacity:0.1;}
+ .st10{opacity:0.15;}
+ .st11{opacity:0.45;}
+ .st12{fill:#FFE1B0;}
+ .st13{fill:#B3DBFF;}
+ .st14{fill:#FBDC7C;}
+ .st15{fill:#FFDB43;}
+ .st16{fill:#E79B00;}
+ .st17{fill:#3883CE;}
+ .st18{fill:none;stroke:#003399;stroke-width:1.375;stroke-miterlimit:10;}
+ .st19{fill:#E8513D;}
+ .st20{fill:#1E1E1E;}
+ .st21{fill:#FFC36D;}
+ .st22{fill:#9FCBFF;}
+ .st23{fill:#E9F7FF;}
+ .st24{fill:#62707C;}
+ .st25{fill:#7A8896;}
+ .st
[netbeans] branch delivery updated: Exposing simple UI action to open next segment of a heap dump
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 1d6f7a1 Exposing simple UI action to open next segment of a heap dump
new 80879f8 Merge pull request #3518 from
JaroslavTulach/jtulach/MultipleHprofSegments
1d6f7a1 is described below
commit 1d6f7a15b2f5687b4b798979ac7e78baa5db5019
Author: Jaroslav Tulach
AuthorDate: Mon Nov 8 07:14:05 2021 +0100
Exposing simple UI action to open next segment of a heap dump
---
.../netbeans/lib/profiler/heap/CacheDirectory.java | 9 +---
.../netbeans/lib/profiler/heap/HeapFactory.java| 2 +-
.../profiler/heapwalk/HeapFragmentWalker.java | 10 +
.../modules/profiler/heapwalk/HeapWalker.java | 26 +-
.../profiler/heapwalk/HeapWalkerManager.java | 26 +-
.../profiler/heapwalk/OverviewController.java | 14 +++-
.../profiler/heapwalk/ui/OverviewControllerUI.java | 2 ++
7 files changed, 67 insertions(+), 22 deletions(-)
diff --git
a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/CacheDirectory.java
b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/CacheDirectory.java
index 9e54981..19d74e3 100644
---
a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/CacheDirectory.java
+++
b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/CacheDirectory.java
@@ -28,16 +28,19 @@ import java.io.IOException;
*/
class CacheDirectory {
-private static final String DIR_EXT = ".hwcache"; // NOI18N
+private static final String DIR_EXT = ".nbcache"; // NOI18N
private static final String DUMP_AUX_FILE = "NBProfiler.nphd"; // NOI18N
private final File.Factory io;
private File cacheDirectory;
-static CacheDirectory getHeapDumpCacheDirectory(File.Factory io, File
heapDump) {
+static CacheDirectory getHeapDumpCacheDirectory(File.Factory io, File
heapDump, int segment) {
String dumpName = heapDump.getName();
+if (segment != 0) {
+dumpName += "_" + segment;
+}
File parent = heapDump.getParentFile();
-File dir = io.newFile(parent, dumpName+DIR_EXT);
+File dir = io.newFile(parent, dumpName + DIR_EXT);
return new CacheDirectory(io, dir);
}
diff --git
a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HeapFactory.java
b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HeapFactory.java
index f8dde3a..5573496 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HeapFactory.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HeapFactory.java
@@ -62,7 +62,7 @@ public class HeapFactory {
public static Heap createHeap(java.io.File heapDump, int segment)
throws FileNotFoundException, IOException {
File hd = JavaIoFile.IO.newFile(heapDump);
-CacheDirectory cacheDir =
CacheDirectory.getHeapDumpCacheDirectory(JavaIoFile.IO, hd);
+CacheDirectory cacheDir =
CacheDirectory.getHeapDumpCacheDirectory(JavaIoFile.IO, hd, segment);
if (!cacheDir.isTemporary()) {
File savedDump = cacheDir.getHeapDumpAuxFile();
diff --git
a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java
b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java
index 4033479..5b6d6ca 100644
---
a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java
+++
b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java
@@ -64,6 +64,7 @@ public class HeapFragmentWalker {
private List stateListeners;
private int retainedSizesStatus;
+private final int heapSegment;
//~ Constructors
-
@@ -73,7 +74,12 @@ public class HeapFragmentWalker {
}
public HeapFragmentWalker(Heap heapFragment, HeapWalker heapWalker,
boolean supportsRetainedSizes) {
+this(heapFragment, 0, heapWalker, supportsRetainedSizes);
+}
+
+HeapFragmentWalker(Heap heapFragment, int heapSegment, HeapWalker
heapWalker, boolean supportsRetainedSizes) {
this.heapFragment = heapFragment;
+this.heapSegment = heapSegment;
this.heapWalker = heapWalker;
this.retainedSizesStatus = supportsRetainedSizes ?
RETAINED_SIZES_UNKNOWN :
@@ -194,6 +200,10 @@ public class HeapFragmentWalker {
public Heap getHeapFragment() {
return heapFragment;
}
+
+public int getHeapSegment() {
+return heapSegment;
+}
public InstancesController getInstancesController() {
[netbeans] branch delivery updated: Manually disable other Java extension
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 33025dc Manually disable other Java extension
new 10d85e4 Merge pull request #3510 from
JaroslavTulach/jtulach/DetectMultipleJavaExtensions
33025dc is described below
commit 33025dc24074a3d6886ccde51d4c8777c993dea2
Author: Jaroslav Tulach
AuthorDate: Wed Jan 12 16:55:26 2022 +0100
Manually disable other Java extension
---
java/java.lsp.server/vscode/src/extension.ts | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/java/java.lsp.server/vscode/src/extension.ts
b/java/java.lsp.server/vscode/src/extension.ts
index 9594f53..8ee2ccc 100644
--- a/java/java.lsp.server/vscode/src/extension.ts
+++ b/java/java.lsp.server/vscode/src/extension.ts
@@ -274,17 +274,15 @@ export function activate(context: ExtensionContext):
VSNetBeansAPI {
let conf = workspace.getConfiguration();
if (conf.get("netbeans.conflict.check")) {
-let e = vscode.extensions.getExtension('redhat.java');
+const id = 'redhat.java';
+let e = vscode.extensions.getExtension(id);
function disablingFailed(reason: any) {
handleLog(log, 'Disabling some services failed ' + reason);
}
if (e && workspace.name) {
-vscode.window.showInformationMessage(`redhat.java found at
${e.extensionPath} - Suppressing some services to not clash with Apache
NetBeans Language Server.`);
-conf.update('java.completion.enabled', false, false).then(() => {
-vscode.window.showInformationMessage('Usage of only one Java
extension is recommended. Certain services of redhat.java have been disabled.
');
-conf.update('java.debug.settings.enableRunDebugCodeLens',
false, false).then(() => {}, disablingFailed);
-conf.update('java.test.editor.enableShortcuts', false,
false).then(() => {}, disablingFailed);
-}, disablingFailed);
+vscode.window.showInformationMessage(`Another Java support
extension is already installed. It is recommended to use only one Java support
per workspace.`, `Manually disable`).then(() => {
+
vscode.commands.executeCommand('workbench.extensions.action.showInstalledExtensions');
+});
}
}
-
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: Honor MxLibrary.path() if specified
This is an automated email from the ASF dual-hosted git repository.
jtulach 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 1de4707 Honor MxLibrary.path() if specified
new 561409b Merge pull request #3453 from
JaroslavTulach/jtulach/HonorMxLibraryPath
1de4707 is described below
commit 1de4707da4a49f98d42bbe0fcc8e8c6995e1a081
Author: Jaroslav Tulach
AuthorDate: Thu Jan 13 08:22:29 2022 +0100
Honor MxLibrary.path() if specified
---
.../org/netbeans/modules/java/mx/project/SuiteSources.java| 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java
index b3bd954..4f9347e 100644
---
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java
+++
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java
@@ -970,7 +970,16 @@ final class SuiteSources implements Sources,
int prefix = libName.indexOf(':');
final String simpleName = libName.substring(prefix + 1);
-File simpleJar = new File(mxCache, simpleName + "_" + lib.sha1() +
".jar");
+File simpleJar = null;
+if (lib.path() != null && !lib.path().isEmpty()) {
+FileObject relativePath = dir.getFileObject(lib.path());
+if (relativePath != null) {
+simpleJar = FileUtil.toFile(relativePath);
+}
+}
+if (simpleJar == null) {
+simpleJar = new File(mxCache, simpleName + "_" + lib.sha1() +
".jar");
+}
if (simpleJar.exists()) {
return simpleJar;
}
-
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: Always call mx build before running the java.mx.projects tests
This is an automated email from the ASF dual-hosted git repository. jtulach 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 33c52ff Always call mx build before running the java.mx.projects tests new 129660d Merge pull request #3435 from JaroslavTulach/jtulach/AlwaysBuildWithMx 33c52ff is described below commit 33c52ffafff78b3290315566f2b24a7dd411719e Author: Jaroslav Tulach AuthorDate: Mon Jan 10 10:34:33 2022 +0100 Always call mx build before running the java.mx.projects tests --- java/java.mx.project/build.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java/java.mx.project/build.xml b/java/java.mx.project/build.xml index b7747e0..b02e9fc 100644 --- a/java/java.mx.project/build.xml +++ b/java/java.mx.project/build.xml @@ -24,7 +24,7 @@ - + @@ -45,6 +45,9 @@ https://github.com/graalvm/mx"/> + + + - 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 vsnetbeans_preview_1263 updated: Disabling database features in VSCode
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch vsnetbeans_preview_1263
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/vsnetbeans_preview_1263 by
this push:
new be8de79 Disabling database features in VSCode
new 76a52dc Merge pull request #3437 from jhorvath/vsc-disable-db
be8de79 is described below
commit be8de791bf1c68819fa81af5c3e6794e30c0bea1
Author: Jan Horvath
AuthorDate: Mon Jan 10 15:21:54 2022 +0100
Disabling database features in VSCode
---
java/java.lsp.server/vscode/package-lock.json | 1240 -
java/java.lsp.server/vscode/package.json | 34 -
java/java.lsp.server/vscode/src/extension.ts | 12 -
3 files changed, 1239 insertions(+), 47 deletions(-)
diff --git a/java/java.lsp.server/vscode/package-lock.json
b/java/java.lsp.server/vscode/package-lock.json
index 0ce5eb8..6720f16 100644
--- a/java/java.lsp.server/vscode/package-lock.json
+++ b/java/java.lsp.server/vscode/package-lock.json
@@ -1,8 +1,1246 @@
{
"name": "apache-netbeans-java",
"version": "0.1.0",
- "lockfileVersion": 1,
+ "lockfileVersion": 2,
"requires": true,
+ "packages": {
+ "": {
+ "name": "apache-netbeans-java",
+ "version": "0.1.0",
+ "license": "Apache 2.0",
+ "dependencies": {
+ "jsonc-parser": "3.0.0",
+ "vscode-debugadapter": "1.42.1",
+ "vscode-languageclient": "7.0.0"
+ },
+ "devDependencies": {
+ "@types/glob": "^7.1.1",
+ "@types/mocha": "^9.0.0",
+ "@types/node": "^13.11.0",
+ "@types/ps-node": "^0.1.0",
+ "@types/vscode": "^1.60.0",
+ "glob": "^7.1.6",
+ "mocha": "^9.1.2",
+ "ps-node": "^0.1.6",
+ "typescript": "^3.8.3",
+ "vscode-test": "^1.3.0"
+ },
+ "engines": {
+ "vscode": "^1.60.0"
+ }
+ },
+ "node_modules/@types/glob": {
+ "version": "7.1.3",
+ "resolved":
"https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz;,
+ "integrity":
"sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+ "dev": true,
+ "dependencies": {
+ "@types/minimatch": "*",
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/minimatch": {
+ "version": "3.0.3",
+ "resolved":
"https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz;,
+ "integrity":
"sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+ "dev": true
+ },
+ "node_modules/@types/mocha": {
+ "version": "9.0.0",
+ "resolved":
"https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz;,
+ "integrity":
"sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==",
+ "dev": true
+ },
+ "node_modules/@types/node": {
+ "version": "13.13.15",
+ "resolved":
"https://registry.npmjs.org/@types/node/-/node-13.13.15.tgz;,
+ "integrity":
"sha512-kwbcs0jySLxzLsa2nWUAGOd/s21WU1jebrEdtzhsj1D4Yps1EOuyI1Qcu+FD56dL7NRNIJtDDjcqIG22NwkgLw==",
+ "dev": true
+ },
[netbeans] branch vsnetbeans_preview_1263 created (now 806b0ef)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch vsnetbeans_preview_1263 in repository https://gitbox.apache.org/repos/asf/netbeans.git. at 806b0ef Merge pull request #3434 from MartinBalin/vsix_12.6.301_docs No new revisions were added by this update. - 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 (6565598 -> 806b0ef)
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 6565598 LSP: Fixed broken code completion for super constructor call. (#3424) new 47e5bf6 VSIX doc changes for 12.6.301 release of NBLS new a154525 Updates after review new 806b0ef Merge pull request #3434 from MartinBalin/vsix_12.6.301_docs The 6407 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/java.lsp.server/vscode/CHANGELOG.md | 10 -- java/java.lsp.server/vscode/README.md | 36 + .../vscode/images/change_method_params.png | Bin 0 -> 96454 bytes .../vscode/images/project-explorer.png | Bin 349921 -> 26531 bytes java/java.lsp.server/vscode/images/run_config.png | Bin 0 -> 36223 bytes 5 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 java/java.lsp.server/vscode/images/change_method_params.png create mode 100644 java/java.lsp.server/vscode/images/run_config.png - 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-jenkins-lib] branch master updated: HTML/Java 1.7.3
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new bdc5c1f HTML/Java 1.7.3
new fb42ce1 Merge pull request #43 from JaroslavTulach/HtmlJava173
bdc5c1f is described below
commit bdc5c1f75b456ed33bc1122d4f8cb601136b5f87
Author: Jaroslav Tulach
AuthorDate: Sun Dec 5 15:15:24 2021 +0100
HTML/Java 1.7.3
---
meta/netbeanshtml4j.json | 8
1 file changed, 8 insertions(+)
diff --git a/meta/netbeanshtml4j.json b/meta/netbeanshtml4j.json
index f2f182e..fb1514f 100644
--- a/meta/netbeanshtml4j.json
+++ b/meta/netbeanshtml4j.json
@@ -55,6 +55,14 @@
"tlp": "true",
"apidocurl": "https://bits.netbeans.org/html+java/1.7.2;
},
+"release-1.7.3": {
+"position": "8",
+"jdk": "jdk_15_latest",
+"jdk_apidoc": "https://docs.oracle.com/javase/8/docs/api/;,
+"version": "1.7.3",
+"tlp": "true",
+"apidocurl": "https://bits.netbeans.org/html+java/1.7.3;
+},
"master": {
"position": "4",
"jdk": "jdk_1.8_latest",
-
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: Avoid using word failed in non-fatal debug messages
This is an automated email from the ASF dual-hosted git repository.
jtulach 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 3cf761d Avoid using word failed in non-fatal debug messages
new 1fc9650 Merge pull request #3425 from JaroslavTulach/jtulach/NoFailed
3cf761d is described below
commit 3cf761dd51ae5c77ba4222cd4730921772bbdf93
Author: Jaroslav Tulach
AuthorDate: Fri Jan 7 12:47:44 2022 +0100
Avoid using word failed in non-fatal debug messages
---
ide/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java | 2 +-
.../src/org/netbeans/api/java/source/ModificationResult.java| 2 +-
platform/openide.util/src/org/openide/util/RequestProcessor.java| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/ide/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java
b/ide/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java
index def826c..d4512db 100644
--- a/ide/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java
+++ b/ide/projectui/src/org/netbeans/modules/project/ui/ProjectsRootNode.java
@@ -370,7 +370,7 @@ public class ProjectsRootNode extends AbstractNode {
if (!data.hasFirst()) {
LOG.log(
Level.WARNING,
-"Warning - project of {0} in {1} failed to supply a
LogicalViewProvider in its lookup", // NOI18N
+"Warning - project of {0} in {1} doesn't supply a
LogicalViewProvider in its lookup", // NOI18N
new Object[]{
project.getClass(),
FileUtil.getFileDisplayName(project.getProjectDirectory())
diff --git
a/java/java.source.base/src/org/netbeans/api/java/source/ModificationResult.java
b/java/java.source.base/src/org/netbeans/api/java/source/ModificationResult.java
index 4360a96..beda9b8 100644
---
a/java/java.source.base/src/org/netbeans/api/java/source/ModificationResult.java
+++
b/java/java.source.base/src/org/netbeans/api/java/source/ModificationResult.java
@@ -236,7 +236,7 @@ public final class ModificationResult {
}
});
if (exceptions [0] != null) {
-LOG.log(Level.INFO, "ModificationResult commit failed with
an exception: ", exceptions[0]);
+LOG.log(Level.INFO, "Cannot commit changes into " + fo,
exceptions[0]);
int s = lastCommitted.size();
for (Throwable t : lastCommitted) {
LOG.log(Level.INFO, "Previous commit number " + s--,
t);
diff --git a/platform/openide.util/src/org/openide/util/RequestProcessor.java
b/platform/openide.util/src/org/openide/util/RequestProcessor.java
index 7a7ff4b..8de90c6 100644
--- a/platform/openide.util/src/org/openide/util/RequestProcessor.java
+++ b/platform/openide.util/src/org/openide/util/RequestProcessor.java
@@ -2124,7 +2124,7 @@ outer: do {
if (SLOW) {
Item item = todo.item;
if (item != null && item.message == null) {
-item.message = "task failed due to: " + ex;
+item.message = ex.toString();
item.initCause(ex);
ex = item;
}
-
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
