(netbeans) 01/01: Merge pull request #7271 from Achal1607/updated-prepare-bundles
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 668bca250cd66fd580b6bc3bc34412e80e324f66 Merge: d108904f19 7a5778747d Author: Matthias Bläsing AuthorDate: Sun May 5 16:41:19 2024 +0200 Merge pull request #7271 from Achal1607/updated-prepare-bundles Restructured node_modules license and package.json Validation Logic .../org/netbeans/prepare/bundles/PrepareBundles.java | 18 -- 1 file changed, 8 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) branch master updated (d108904f19 -> 668bca250c)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from d108904f19 Merge pull request #7346 from matthiasblaesing/logging add 7a5778747d Refactored code a bit of prepare-bundles for better handling of node modules new 668bca250c Merge pull request #7271 from Achal1607/updated-prepare-bundles 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: .../org/netbeans/prepare/bundles/PrepareBundles.java | 18 -- 1 file changed, 8 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) branch master updated (886d5d5b1e -> d20d7e4075)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 886d5d5b1e Merge pull request #7262 from dbalek/dbalek/mictonaut-cc-fix add a053b51f24 Fix generation of font color value for JavaScript debugger add 70e4349a08 Implement Node Debugging Support using Chrome DevTools Protocol add 83b1b4a969 Enable multiple javascript debuggers (V8 protocol, CDT protocol, GraalVM) add 2f3db018c8 JS-Breakpoint list should show hit state as JPDA add 74fe6f5fe6 Add TS Mimetypes to JS debugger add 91431f6c2d JS sourcemap: Handle unmappable files in debug frames new d20d7e4075 Merge pull request #4220 from matthiasblaesing/chrome_devtools_protocol 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: ide/javascript2.debug.ui/nbproject/project.xml |1 + .../modules/javascript2/debug/ui/JSUtils.java |3 +- .../debug/ui/breakpoints/JSLineBreakpointType.java | 15 +- .../ToggleBreakpointActionProvider.java| 15 +- .../debug/ui/models/ViewModelSupport.java | 62 +- .../ui/models/breakpoints/BreakpointNodeModel.java | 12 +- ide/javascript2.debug/nbproject/project.xml|2 + .../debug/breakpoints/JSBreakpointStatus.java |7 + .../debug/breakpoints/JSLineBreakpoint.java| 20 +- .../debug/sources/SourceFilesCache.java|8 +- ide/web.common/nbproject/project.xml |2 + .../web/common/sourcemap/SourceMapsTranslator.java |2 +- .../common/sourcemap/SourceMapsTranslatorImpl.java |3 +- java/debugger.jpda.trufflenode/manifest.mf |1 + .../nbproject/project.xml |9 - .../debugger/jpda/truffle/node/Bundle.properties |1 + .../node/DebuggerStartModifierFactoryImpl.java | 36 + ...xtender.java => DebuggerStartModifierImpl.java} | 19 +- .../modules/debugger/jpda/truffle/node/layer.xml | 33 + nbbuild/cluster.properties |3 + webcommon/javascript.cdtdebug.ui/build.xml | 26 + webcommon/javascript.cdtdebug.ui/manifest.mf |6 + .../nbproject/project.properties} |8 +- .../javascript.cdtdebug.ui}/nbproject/project.xml | 74 +- .../org.netbeans.spi.viewmodel.ColumnModel |0 .../javascript/cdtdebug/ui}/Bundle.properties |6 +- .../ui/CDTDebuggerEngineComponentsProvider.java| 110 +++ .../javascript/cdtdebug/ui/EditorUtils.java| 99 ++ .../ui/actions/CDTDebugActionsProvider.java| 147 +++ .../ui/annotation/CallStackAnnotation.java | 44 + .../ui/annotation/CallStackAnnotationListener.java | 215 + .../ui/annotation/CurrentLineAnnotation.java | 44 + .../cdtdebug/ui/attach/AttachCustomizer.form | 181 .../cdtdebug}/ui/attach/AttachCustomizer.java | 55 +- .../cdtdebug}/ui/attach/Bundle.properties |0 .../cdtdebug/ui/attach/CDTAttachType.java} | 16 +- .../ui/callstack/DebuggingViewSupportImpl.java | 116 +++ .../javascript/cdtdebug/ui/callstack/JSThread.java | 133 +++ .../ui/callstack/models/DebuggingActionsModel.java | 160 .../ui/callstack/models/DebuggingModel.java| 275 ++ .../cdtdebug/ui/eval/CDTCodeEvaluator.java | 158 +++ .../cdtdebug/ui/eval/EvaluationResultsModel.java | 304 ++ .../javascript/cdtdebug/ui/eval/VarOrError.java| 50 + .../cdtdebug/ui/models/DebuggingActionsModel.java | 160 .../cdtdebug/ui/models/DebuggingModel.java | 262 + .../cdtdebug}/ui/resources/Bundle.properties |0 .../javascript/cdtdebug/ui/resources/mf-layer.xml | 201 .../ui/vars/models/PinWatchValueProvider.java | 209 .../cdtdebug/ui/vars/models/VariablesModel.java| 399 .../cdtdebug/ui/vars/models/WatchesModel.java | 501 ++ .../ui/vars/tooltip/ToolTipAnnotation.java | 105 ++ webcommon/javascript.cdtdebug/build.xml| 26 + .../manifest.mf|5 +- .../nbproject/project.properties} |8 +- .../nbproject/project.xml | 39 +- .../modules/javascript/cdtdebug}/Bundle.properties |8 +- .../modules/javascript/cdtdebug/CDTDebugger.java | 256 + .../cdtdebug/CDTDebuggerEngineProvider.java| 58 ++ .../cdtdebug/CDTDebuggerSessionProvider.java | 71 ++ .../modules/javascript/cdtdebug/CDTScript.java | 116 +++ .../javascript/cdtdebug/ScriptsHandler.java| 548 +++ .../cdtdebug/actions/CDTDebugActionsProvider.java | 156 +++ .../modules/javascript/cdtd
(netbeans) 01/01: Merge pull request #4220 from matthiasblaesing/chrome_devtools_protocol
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit d20d7e407574a3635f34181c6a7dd94622d722bf Merge: 886d5d5b1e 91431f6c2d Author: Matthias Bläsing AuthorDate: Mon Apr 15 19:59:03 2024 +0200 Merge pull request #4220 from matthiasblaesing/chrome_devtools_protocol Add support for Chrome DevTools Protocol for NodeJS Debugging ide/javascript2.debug.ui/nbproject/project.xml |1 + .../modules/javascript2/debug/ui/JSUtils.java |3 +- .../debug/ui/breakpoints/JSLineBreakpointType.java | 15 +- .../ToggleBreakpointActionProvider.java| 15 +- .../debug/ui/models/ViewModelSupport.java | 62 +- .../ui/models/breakpoints/BreakpointNodeModel.java | 12 +- ide/javascript2.debug/nbproject/project.xml|2 + .../debug/breakpoints/JSBreakpointStatus.java |7 + .../debug/breakpoints/JSLineBreakpoint.java| 20 +- .../debug/sources/SourceFilesCache.java|8 +- ide/web.common/nbproject/project.xml |2 + .../web/common/sourcemap/SourceMapsTranslator.java |2 +- .../common/sourcemap/SourceMapsTranslatorImpl.java |3 +- java/debugger.jpda.trufflenode/manifest.mf |1 + .../nbproject/project.xml |9 - .../debugger/jpda/truffle/node/Bundle.properties |1 + .../node/DebuggerStartModifierFactoryImpl.java | 36 + ...xtender.java => DebuggerStartModifierImpl.java} | 19 +- .../modules/debugger/jpda/truffle/node/layer.xml | 33 + nbbuild/cluster.properties |3 + webcommon/javascript.cdtdebug.ui/build.xml | 26 + webcommon/javascript.cdtdebug.ui/manifest.mf |6 + .../nbproject/project.properties} |8 +- .../javascript.cdtdebug.ui}/nbproject/project.xml | 74 +- .../org.netbeans.spi.viewmodel.ColumnModel |4 + .../javascript/cdtdebug/ui}/Bundle.properties |6 +- .../ui/CDTDebuggerEngineComponentsProvider.java| 110 +++ .../javascript/cdtdebug/ui/EditorUtils.java| 99 ++ .../ui/actions/CDTDebugActionsProvider.java| 147 +++ .../ui/annotation/CallStackAnnotation.java | 44 + .../ui/annotation/CallStackAnnotationListener.java | 215 + .../ui/annotation/CurrentLineAnnotation.java | 44 + .../cdtdebug/ui/attach/AttachCustomizer.form | 181 .../cdtdebug}/ui/attach/AttachCustomizer.java | 55 +- .../cdtdebug/ui/attach}/Bundle.properties | 10 +- .../cdtdebug/ui/attach/CDTAttachType.java} | 16 +- .../ui/callstack/DebuggingViewSupportImpl.java | 116 +++ .../javascript/cdtdebug/ui/callstack/JSThread.java | 133 +++ .../ui/callstack/models/DebuggingActionsModel.java | 160 .../ui/callstack/models/DebuggingModel.java| 275 ++ .../cdtdebug/ui/eval/CDTCodeEvaluator.java | 158 +++ .../cdtdebug/ui/eval/EvaluationResultsModel.java | 304 ++ .../javascript/cdtdebug/ui/eval/VarOrError.java| 50 + .../cdtdebug/ui/models/DebuggingActionsModel.java | 160 .../cdtdebug/ui/models/DebuggingModel.java | 262 + .../cdtdebug/ui/resources}/Bundle.properties |5 +- .../javascript/cdtdebug/ui/resources/mf-layer.xml | 201 .../ui/vars/models/PinWatchValueProvider.java | 209 .../cdtdebug/ui/vars/models/VariablesModel.java| 399 .../cdtdebug/ui/vars/models/WatchesModel.java | 501 ++ .../ui/vars/tooltip/ToolTipAnnotation.java | 105 ++ webcommon/javascript.cdtdebug/build.xml| 26 + .../manifest.mf|5 +- .../nbproject/project.properties} |8 +- .../nbproject/project.xml | 39 +- .../modules/javascript/cdtdebug}/Bundle.properties |8 +- .../modules/javascript/cdtdebug/CDTDebugger.java | 256 + .../cdtdebug/CDTDebuggerEngineProvider.java| 58 ++ .../cdtdebug/CDTDebuggerSessionProvider.java | 71 ++ .../modules/javascript/cdtdebug/CDTScript.java | 116 +++ .../javascript/cdtdebug/ScriptsHandler.java| 548 +++ .../cdtdebug/actions/CDTDebugActionsProvider.java | 156 +++ .../modules/javascript/cdtdebug/api/Connector.java | 145 +++ .../cdtdebug/breakpoints/BreakpointsHandler.java | 296 ++ .../breakpoints/CDTBreakpointsActivation.java | 91 ++ .../breakpoints/CDTBreakpointsActiveService.java | 138 +++ .../cdtdebug/breakpoints/JSBreakpointsManager.java | 122 +++ .../netbeans/modules/javascript/cdtdebug/layer.xml | 33 + .../nodejs/DebuggerStartModifierFactoryImpl.java | 35 + .../cdtdebug/nodejs/DebuggerStartModifierImpl.java | 120 +++ .../cdtdebug/sessions/SessionSwitcher.java | 73 ++ .../cdtdebug/sources/ChangeLiveSupport.java|
(netbeans) 01/01: Merge pull request #7222 from matthiasblaesing/ns_jsf4
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit e8fb660e9fe47f14991e46a22ffcb38bf37bab75 Merge: a80767db74 65e0d51591 Author: Matthias Bläsing AuthorDate: Thu Apr 11 18:01:33 2024 +0200 Merge pull request #7222 from matthiasblaesing/ns_jsf4 JSF Facelets template wizard: Support JSF 4+ namespace .../templates/compositionTemplateClient.template | 2 +- .../resources/templates/htmlTemplateClient.template | 2 +- .../resources/templates/template-css-1.template | 4 ++-- .../resources/templates/template-css-2.template | 4 ++-- .../resources/templates/template-css-3.template | 4 ++-- .../resources/templates/template-css-4.template | 4 ++-- .../resources/templates/template-css-5.template | 4 ++-- .../resources/templates/template-css-6.template | 4 ++-- .../resources/templates/template-css-7.template | 4 ++-- .../resources/templates/template-css-8.template | 4 ++-- .../resources/templates/template-table-1.template| 4 ++-- .../resources/templates/template-table-2.template| 4 ++-- .../resources/templates/template-table-3.template| 4 ++-- .../resources/templates/template-table-4.template| 4 ++-- .../resources/templates/template-table-5.template| 4 ++-- .../resources/templates/template-table-6.template| 4 ++-- .../resources/templates/template-table-7.template| 4 ++-- .../resources/templates/template-table-8.template| 4 ++-- .../web/jsf/wizards/TemplateClientIterator.java | 20 ++-- .../modules/web/jsf/wizards/TemplateIterator.java| 12 20 files changed, 60 insertions(+), 40 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 (a80767db74 -> e8fb660e9f)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from a80767db74 Merge pull request #7239 from neilcsmith-net/dashboard-api add 65e0d51591 JSF Facelets template wizard: Support JSF 4+ namespace new e8fb660e9f Merge pull request #7222 from matthiasblaesing/ns_jsf4 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: .../templates/compositionTemplateClient.template | 2 +- .../resources/templates/htmlTemplateClient.template | 2 +- .../resources/templates/template-css-1.template | 4 ++-- .../resources/templates/template-css-2.template | 4 ++-- .../resources/templates/template-css-3.template | 4 ++-- .../resources/templates/template-css-4.template | 4 ++-- .../resources/templates/template-css-5.template | 4 ++-- .../resources/templates/template-css-6.template | 4 ++-- .../resources/templates/template-css-7.template | 4 ++-- .../resources/templates/template-css-8.template | 4 ++-- .../resources/templates/template-table-1.template| 4 ++-- .../resources/templates/template-table-2.template| 4 ++-- .../resources/templates/template-table-3.template| 4 ++-- .../resources/templates/template-table-4.template| 4 ++-- .../resources/templates/template-table-5.template| 4 ++-- .../resources/templates/template-table-6.template| 4 ++-- .../resources/templates/template-table-7.template| 4 ++-- .../resources/templates/template-table-8.template| 4 ++-- .../web/jsf/wizards/TemplateClientIterator.java | 20 ++-- .../modules/web/jsf/wizards/TemplateIterator.java| 12 20 files changed, 60 insertions(+), 40 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 (4b3eb69878 -> 17685113f9)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 4b3eb69878 Merge pull request #7236 from matthiasblaesing/jsf_composite_resources add 170c1e3275 JS: Enable parsing import.meta (meta property) in addition to new.target (already supported) add 86be3c42d9 JS: Ensure lexer and parser have similar interpretation of new.target and import.meta add bb2d43ffd2 JS: Provide model data for meta properties new.target and import.meta add 9766a6204c JS: Improve completion for property chain (obj.prop1.prop2) with embedded comments and new lines add 17685113f9 Merge pull request #7211 from matthiasblaesing/js-import-meta No new revisions were added by this update. Summary of changes: .../foreach/index.html.testForEach.completion | 2 + .../index.html.testForEachAlias.completion | 2 + .../index.html.testIssue231569.completion | 2 + .../template/index.html.testTemplate.completion| 2 + .../index.html.testTemplateForEach.completion | 2 + .../index.html.testTemplateInner.completion| 2 + .../completion/with/index.html.testWith.completion | 2 + .../nbproject/project.properties | 3 +- .../editor/CompletionContextFinder.java| 16 ++- .../classpath/MetaPropertiesModelContributor.java | 69 .../javascript2/editor/classpath/metaproperties.js | 56 ++ ...01.js.testOfferingCallbackFunction01.completion | 2 + .../constructors.js.testConstructors_01.completion | 2 + .../data/testfiles/completion/gh5919/gh5919_0.js | 20 .../gh5919/gh5919_0.js.testGH5919_0_1.completion | 6 + .../data/testfiles/completion/gh5919/gh5919_1.js | 23 .../gh5919/gh5919_1.js.testGH5919_1_1.completion | 5 + .../gh5919/gh5919_1.js.testGH5919_1_2.completion | 5 + .../gh5919/gh5919_1.js.testGH5919_1_3.completion | 6 + .../gh5919/gh5919_1.js.testGH5919_1_4.completion | 5 + .../gh5919_1.js.testGH5919_1_5.completion} | 5 +- .../gh5919/gh5919_1.js.testGH5919_1_6.completion | 5 + .../gh5919/gh5919_1.js.testGH5919_1_7.completion | 5 + .../data/testfiles/completion/gh5919/gh5919_2.js | 23 .../gh5919/gh5919_2.js.testGH5919_2_1.completion | 5 + .../gh5919/gh5919_2.js.testGH5919_2_2.completion | 5 + .../gh5919/gh5919_2.js.testGH5919_2_3.completion | 6 + .../gh5919/gh5919_2.js.testGH5919_2_4.completion | 5 + .../gh5919_2.js.testGH5919_2_5.completion} | 5 +- .../gh5919/gh5919_2.js.testGH5919_2_6.completion | 5 + .../gh5919/gh5919_2.js.testGH5919_2_7.completion | 5 + .../data/testfiles/completion/gh5919/gh5919_3.js | 23 .../gh5919/gh5919_3.js.testGH5919_3_1.completion | 5 + .../gh5919/gh5919_3.js.testGH5919_3_2.completion | 5 + .../gh5919/gh5919_3.js.testGH5919_3_3.completion | 5 + .../gh5919/gh5919_3.js.testGH5919_3_4.completion | 6 + .../gh5919/gh5919_3.js.testGH5919_3_5.completion | 5 + .../gh5919_3.js.testGH5919_3_6.completion} | 5 +- .../gh5919/gh5919_3.js.testGH5919_3_7.completion | 5 + .../gh5919/gh5919_3.js.testGH5919_3_8.completion | 5 + .../gh5919/gh5919_3.js.testGH5919_3_9.completion | 5 + .../issue226650.html.testIssue226650.completion| 2 + .../issue232178.js.testIssue232178_01.completion | 2 + .../issue240914.js.testIssue240914_01.completion | 2 + .../issue240914.js.testIssue240914_04.completion | 2 + ...ssue254609Test.js.testIssue254609_01.completion | 1 + ...ferenceNew.js.testTypeInferenceNew01.completion | 2 + .../completion/with/with1.js.testWith1.completion | 2 + .../completion/with/with3.js.testWith3.completion | 2 + .../withAnonymous/with5.js.testWith5.completion| 2 + .../withComplex/with4.js.testWith4a.completion | 2 + .../withComplex/with4.js.testWith4b.completion | 2 + .../withComplex/with4.js.testWith4c.completion | 2 + .../ES6/meta-property/assign-new-target.js.ast.xml | 9 +- .../meta-property/import-meta-resolve-comment.js | 20 .../import-meta-resolve-comment.js.ast.xml | 57 ++ .../meta-property/import-meta-resolve-multiline.js | 24 ...ml => import-meta-resolve-multiline.js.ast.xml} | 53 + .../ES6/meta-property/import-meta-resolve.js | 20 .../meta-property/import-meta-resolve.js.ast.xml | 57 ++ .../parser/ES6/meta-property/import-meta-url.js| 20 ...ssion.js.ast.xml => import-meta-url.js.ast.xml} | 48 .../ES6/meta-property/new-new-target.js.ast.xml| 9 +- .../new-target-declaration.js.ast.xml | 9 +- .../meta-property/new-target-expression.js.ast.xml | 9 +- .../ES6/meta-property/new-target-invoke.js.ast.xml | 9 +- .../meta-property/new-target-precedence.js.ast.xml | 9 +- .../issue232792.js.testCCin
(netbeans) branch master updated (dcd15da3e2 -> 4b3eb69878)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from dcd15da3e2 Merge pull request #7218 from matthiasblaesing/catalogs_payara_glassfish add 55ff385a47 JSF: Support composite components in resource folder defined by jakarta.faces.WEBAPP_RESOURCES_DIRECTORY new 4b3eb69878 Merge pull request #7236 from matthiasblaesing/jsf_composite_resources 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/web/jsf/editor/index/CompositeComponentModel.java | 4 +++- 1 file changed, 3 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) 01/01: Merge pull request #7236 from matthiasblaesing/jsf_composite_resources
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 4b3eb69878487a96fb4b56b624a9918028c28eba Merge: dcd15da3e2 55ff385a47 Author: Matthias Bläsing AuthorDate: Wed Apr 10 18:31:38 2024 +0200 Merge pull request #7236 from matthiasblaesing/jsf_composite_resources JSF: Support composite components in resource folder defined by jakarta.faces.WEBAPP_RESOURCES_DIRECTORY .../modules/web/jsf/editor/index/CompositeComponentModel.java | 4 +++- 1 file changed, 3 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) 01/01: Merge pull request #7218 from matthiasblaesing/catalogs_payara_glassfish
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit dcd15da3e271a8ef3a9beebb03ef8faeb7f44cdd Merge: 592124a97f 0986838d51 Author: Matthias Bläsing AuthorDate: Tue Apr 9 21:00:33 2024 +0200 Merge pull request #7218 from matthiasblaesing/catalogs_payara_glassfish XML Catalog GF/Payara: Ensure only existing schemas are resolved .../modules/glassfish/javaee/RunTimeDDCatalog.java | 635 + .../modules/payara/jakartaee/RunTimeDDCatalog.java | 586 +-- 2 files changed, 539 insertions(+), 682 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 (592124a97f -> dcd15da3e2)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 592124a97f Merge pull request #7246 from matthiasblaesing/derby_jpa_integration add 3afc53eca7 XML Catalog GF/Payara: Ensure only existing schemas are resolved add 0986838d51 XML Catalog GF/Payara: General cleanup new dcd15da3e2 Merge pull request #7218 from matthiasblaesing/catalogs_payara_glassfish 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/javaee/RunTimeDDCatalog.java | 635 + .../modules/payara/jakartaee/RunTimeDDCatalog.java | 586 +-- 2 files changed, 539 insertions(+), 682 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) 01/01: Merge pull request #7246 from matthiasblaesing/derby_jpa_integration
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 592124a97f4d114152b8b46a3ba38f86ce759835 Merge: 57b7d4982a 4ac0ff8d9e Author: Matthias Bläsing AuthorDate: Tue Apr 9 18:28:41 2024 +0200 Merge pull request #7246 from matthiasblaesing/derby_jpa_integration Fix DB selection in JPA entity generation and improve derby integration .../modules/db/explorer/dlg/AddDriverDialog.java | 37 ++-- .../org/netbeans/modules/db/util/Bundle.properties | 6 +- .../netbeans/modules/db/util/DriverListUtil.java | 10 +++- .../modules/derby/ConnectDatabaseAction.java | 11 +++- .../netbeans/modules/derby/DerbyDatabasesImpl.java | 30 +++--- .../org/netbeans/modules/derby/DerbyOptions.java | 29 +- .../org/netbeans/modules/derby/ExecSupport.java| 2 +- .../org/netbeans/modules/derby/RegisterDerby.java | 65 -- ide/derby/src/org/netbeans/modules/derby/layer.xml | 4 ++ .../wizard/fromdb/DatabaseTablesPanel.java | 2 +- 10 files changed, 141 insertions(+), 55 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 (57b7d4982a -> 592124a97f)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 57b7d4982a Merge pull request #7235 from mbien/resolve-position-conflicts add 81fe1f87ee Enable starting older derby versions on new JVMs and support derby JDBC driver for derby >= 10.15 add 4ac0ff8d9e JPA: Prevent NullPointerException when checking for DB connection JakartaEE server new 592124a97f Merge pull request #7246 from matthiasblaesing/derby_jpa_integration 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/db/explorer/dlg/AddDriverDialog.java | 37 ++-- .../org/netbeans/modules/db/util/Bundle.properties | 6 +- .../netbeans/modules/db/util/DriverListUtil.java | 10 +++- .../modules/derby/ConnectDatabaseAction.java | 11 +++- .../netbeans/modules/derby/DerbyDatabasesImpl.java | 30 +++--- .../org/netbeans/modules/derby/DerbyOptions.java | 29 +- .../org/netbeans/modules/derby/ExecSupport.java| 2 +- .../org/netbeans/modules/derby/RegisterDerby.java | 65 -- ide/derby/src/org/netbeans/modules/derby/layer.xml | 4 ++ .../wizard/fromdb/DatabaseTablesPanel.java | 2 +- 10 files changed, 141 insertions(+), 55 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 (87016c5472 -> d1fac36881)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 87016c5472 Merge pull request #7188 from mbien/basic-javac-release-support add 4ad9fe2b77 JsfVersion might not be known, so null case must be handled add d1fac36881 Merge pull request #7216 from matthiasblaesing/jsf No new revisions were added by this update. Summary of changes: .../src/org/netbeans/modules/web/jsf/editor/JspJsfELPlugin.java| 3 ++- .../netbeans/modules/web/jsf/palette/items/ManagedBeanCustomizer.java | 3 ++- .../src/org/netbeans/modules/web/jsf/wizards/JSFClientGenerator.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
(netbeans) branch master updated (aaabc1dffa -> cac7b2c80f)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from aaabc1dffa Merge pull request #7204 from pepness/glassfish-8-m3 add 214f39ae96 Register comment/uncomment action in editor toolbar for properties and XML files add cac7b2c80f Merge pull request #7223 from matthiasblaesing/properties No new revisions were added by this update. Summary of changes: .../src/org/netbeans/modules/properties/syntax/Layer.xml | 16 .../netbeans/modules/xml/tools/resources/mf-layer.xml| 12 +++- 2 files changed, 27 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) 01/01: Merge pull request #7230 from matthiasblaesing/update-versions-versioning
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit b70fb8bc7e8d2e0340983eaaf2a10e8dad89ca60 Merge: 15393b7fb0 c16bd52b46 Author: Matthias Bläsing AuthorDate: Wed Apr 3 19:09:49 2024 +0200 Merge pull request #7230 from matthiasblaesing/update-versions-versioning Update versions after incompatible changes in versioning.util and mercurial ide/bugtracking.bridge/manifest.mf | 2 +- ide/bugtracking.bridge/nbproject/project.xml| 3 ++- ide/git/nbproject/project.properties| 2 +- ide/git/nbproject/project.xml | 3 ++- ide/localhistory/manifest.mf| 2 +- ide/localhistory/nbproject/project.xml | 3 ++- ide/mercurial/manifest.mf | 2 +- ide/mercurial/nbproject/project.properties | 2 +- ide/mercurial/nbproject/project.xml | 3 ++- ide/subversion/nbproject/project.properties | 2 +- ide/subversion/nbproject/project.xml| 3 ++- ide/team.ide/manifest.mf| 2 +- ide/team.ide/nbproject/project.xml | 3 ++- ide/versioning.indexingbridge/manifest.mf | 2 +- ide/versioning.indexingbridge/nbproject/project.xml | 3 ++- ide/versioning.ui/nbproject/project.properties | 2 +- ide/versioning.ui/nbproject/project.xml | 3 ++- ide/versioning.util/manifest.mf | 2 +- ide/versioning.util/nbproject/project.properties| 2 +- 19 files changed, 27 insertions(+), 19 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 (15393b7fb0 -> b70fb8bc7e)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 15393b7fb0 Merge pull request #7227 from sdedic/sdedic/micronaut-test-fixes add c16bd52b46 Update versions after incompatible changes in versioning.util and mercurial new b70fb8bc7e Merge pull request #7230 from matthiasblaesing/update-versions-versioning 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: ide/bugtracking.bridge/manifest.mf | 2 +- ide/bugtracking.bridge/nbproject/project.xml| 3 ++- ide/git/nbproject/project.properties| 2 +- ide/git/nbproject/project.xml | 3 ++- ide/localhistory/manifest.mf| 2 +- ide/localhistory/nbproject/project.xml | 3 ++- ide/mercurial/manifest.mf | 2 +- ide/mercurial/nbproject/project.properties | 2 +- ide/mercurial/nbproject/project.xml | 3 ++- ide/subversion/nbproject/project.properties | 2 +- ide/subversion/nbproject/project.xml| 3 ++- ide/team.ide/manifest.mf| 2 +- ide/team.ide/nbproject/project.xml | 3 ++- ide/versioning.indexingbridge/manifest.mf | 2 +- ide/versioning.indexingbridge/nbproject/project.xml | 3 ++- ide/versioning.ui/nbproject/project.properties | 2 +- ide/versioning.ui/nbproject/project.xml | 3 ++- ide/versioning.util/manifest.mf | 2 +- ide/versioning.util/nbproject/project.properties| 2 +- 19 files changed, 27 insertions(+), 19 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) 01/01: Merge pull request #7163 from matthiasblaesing/entities_from_database
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 1fc4c04d31064666c43442bd361f08841553d6e0 Merge: 1bfd7f9239 6ce16beef5 Author: Matthias Bläsing AuthorDate: Sun Mar 31 20:50:50 2024 +0200 Merge pull request #7163 from matthiasblaesing/entities_from_database Entities from databases: Bugfix entity generation in plain java (non webapp) projects .../wizard/fromdb/DatabaseTablesPanel.java | 23 +++--- 1 file changed, 16 insertions(+), 7 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 (1bfd7f9239 -> 1fc4c04d31)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 1bfd7f9239 Generate Java Sources from JSON grammars pre-compile add d520cb3896 Fix label of source selector for database connection (wait label needs to be replace by real label) add 6ce16beef5 Bugfix entity generation in plain java (non webapp) projects new 1fc4c04d31 Merge pull request #7163 from matthiasblaesing/entities_from_database 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: .../wizard/fromdb/DatabaseTablesPanel.java | 23 +++--- 1 file changed, 16 insertions(+), 7 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) 01/01: Merge pull request #7160 from matthiasblaesing/handle_jar_url_in_js_classpath_provider
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit c9e36e0e950923ee60274e96a2eb8c9a76fc2628 Merge: b1f2e5b4a0 336160a569 Author: Matthias Bläsing AuthorDate: Mon Mar 18 08:16:36 2024 +0100 Merge pull request #7160 from matthiasblaesing/handle_jar_url_in_js_classpath_provider Handle JAR-URL as codesource for javascript editor module .../editor/classpath/ClassPathProviderImpl.java| 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
(netbeans) branch master updated (b1f2e5b4a0 -> c9e36e0e95)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from b1f2e5b4a0 Made HCL AST on records Use TextBlocks in formatting test, minor enhancements add 336160a569 Handle JAR-URL as codesource for javascript editor module new c9e36e0e95 Merge pull request #7160 from matthiasblaesing/handle_jar_url_in_js_classpath_provider 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: .../editor/classpath/ClassPathProviderImpl.java| 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
(netbeans) 01/01: Merge pull request #7080 from matthiasblaesing/session_bean_generation
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 01b8f9a7d6fd78758bee1d68c7ec909aa58642fa Merge: 4da78ff1e8 795f283114 Author: Matthias Bläsing AuthorDate: Sat Feb 24 18:02:58 2024 +0100 Merge pull request #7080 from matthiasblaesing/session_bean_generation Fix detection of support for generation session beans from entity classes and support jakarta package names .../wizard/jpa/dao/AppServerValidationPanel.java | 4 +- .../wizard/jpa/dao/EjbFacadeWizardIterator.java| 33 ++-- .../ejb/wizard/jpa/dao/EjbFacadeWizardPanel2.java | 19 ++- .../ejb/action/AbstractAddMethodStrategy.java | 44 +++-- .../ejb/action/AddBusinessMethodStrategy.java | 2 +- .../ejb/action/AddCreateMethodStrategy.java| 4 +- .../ejb/action/AddFinderMethodStrategy.java| 8 +- .../ejb/action/AddHomeMethodStrategy.java | 2 +- .../ejb/action/AddSelectMethodStrategy.java| 4 +- .../ejb/shared/ComponentMethodModel.java | 6 +- .../ui/logicalview/ejb/shared/MethodNode.java | 6 +- .../ContainerManagedJTAInjectableInWeb.java| 2 +- .../EntityManagerGenerationStrategySupport.java| 184 + 13 files changed, 238 insertions(+), 80 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 (4da78ff1e8 -> 01b8f9a7d6)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 4da78ff1e8 Merge pull request #7020 from matthiasblaesing/jakarta_fini add 795f283114 Fix detection of support for generation session beans from entity classes and support jakarta package names new 01b8f9a7d6 Merge pull request #7080 from matthiasblaesing/session_bean_generation 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: .../wizard/jpa/dao/AppServerValidationPanel.java | 4 +- .../wizard/jpa/dao/EjbFacadeWizardIterator.java| 33 ++-- .../ejb/wizard/jpa/dao/EjbFacadeWizardPanel2.java | 19 ++- .../ejb/action/AbstractAddMethodStrategy.java | 44 +++-- .../ejb/action/AddBusinessMethodStrategy.java | 2 +- .../ejb/action/AddCreateMethodStrategy.java| 4 +- .../ejb/action/AddFinderMethodStrategy.java| 8 +- .../ejb/action/AddHomeMethodStrategy.java | 2 +- .../ejb/action/AddSelectMethodStrategy.java| 4 +- .../ejb/shared/ComponentMethodModel.java | 6 +- .../ui/logicalview/ejb/shared/MethodNode.java | 6 +- .../ContainerManagedJTAInjectableInWeb.java| 2 +- .../EntityManagerGenerationStrategySupport.java| 184 + 13 files changed, 238 insertions(+), 80 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 (a77e2fdf92 -> 4da78ff1e8)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from a77e2fdf92 Merge pull request #6985 from matthiasblaesing/jsp_jakarta3 add 0b790a8f30 Update j2ee.ejbverification for JakartaEE support add 410e94e06c Update missing pieces of JakartaEE support in jakarta.web.beans new 4da78ff1e8 Merge pull request #7020 from matthiasblaesing/jakarta_fini 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: .../j2ee/ejbverification/EJBAPIAnnotations.java | 19 ++- .../ejbverification/rules/AnnotationPostContruct.java | 7 --- .../rules/AsynchronousMethodInvocation.java | 5 +++-- .../j2ee/ejbverification/rules/BeanImplementsBI.java | 2 ++ .../ejbverification/rules/BusinessMethodExposed.java | 7 +-- .../rules/LocalAnnotatedBeanHasLBI.java | 3 ++- .../rules/PersistentTimerInEjbLite.java | 8 ++-- .../rules/RemoteAnnotatedBeanHasRBI.java | 3 ++- .../rules/SessionSynchImplementedBySFSBOnly.java | 3 ++- ...ValueNotSpecifiedForRemoteAnnotationInterface.java | 5 - .../modules/j2ee/ejbverification/rules/WSisSLSB.java | 5 - .../web/beans/actions/InterceptorGenerator.java | 2 +- .../beans/analysis/analyzer/type/Bundle.properties| 2 +- .../web/beans/hints/CreateInterceptorBinding.java | 2 +- .../jakarta/web/beans/hints/CreateQualifierFix.java | 2 +- .../jakarta/web/beans/resources/Interceptor.template | 2 +- .../modules/web/beans/actions/InterceptorFactory.java | 1 - .../web/beans/actions/InterceptorGenerator.java | 1 - .../web/beans/analysis/analyzer/AnnotationUtil.java | 1 - .../analysis/analyzer/type/ManagedBeansAnalizer.java | 1 - .../modules/web/beans/hints/CreateQualifier.java | 1 - .../beans/impl/model/AnnotationObjectProvider.java| 1 - .../modules/web/beans/impl/model/BeansFilter.java | 1 - .../web/beans/impl/model/EnableBeansFilter.java | 1 - .../beans/impl/model/EventInjectionPointLogic.java| 1 - .../beans/impl/model/FieldInjectionPointLogic.java| 1 - .../beans/impl/model/InterceptorBindingChecker.java | 1 - .../web/beans/impl/model/InterceptorObject.java | 1 - .../web/beans/impl/model/MemberBindingFilter.java | 1 - .../impl/model/ParameterInjectionPointLogic.java | 1 - .../modules/web/beans/impl/model/ScopeChecker.java| 1 - .../web/beans/impl/model/StereotypeChecker.java | 1 - .../impl/model/results/InterceptorsResultImpl.java| 1 - .../web/beans/impl/model/results/ResultImpl.java | 1 - .../modules/web/beans/navigation/BindingsPanel.java | 1 - .../modules/web/beans/navigation/DecoratorsPanel.java | 1 - .../modules/web/beans/navigation/ObserversPanel.java | 1 - .../navigation/actions/WebBeansActionHelper.java | 1 - 38 files changed, 57 insertions(+), 42 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) 01/01: Merge pull request #7020 from matthiasblaesing/jakarta_fini
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 4da78ff1e88f77431908692bef24cd338fb114ed Merge: a77e2fdf92 410e94e06c Author: Matthias Bläsing AuthorDate: Sat Feb 24 16:32:45 2024 +0100 Merge pull request #7020 from matthiasblaesing/jakarta_fini Final changes for JakartaEE adjustments .../j2ee/ejbverification/EJBAPIAnnotations.java | 19 ++- .../ejbverification/rules/AnnotationPostContruct.java | 7 --- .../rules/AsynchronousMethodInvocation.java | 5 +++-- .../j2ee/ejbverification/rules/BeanImplementsBI.java | 2 ++ .../ejbverification/rules/BusinessMethodExposed.java | 7 +-- .../rules/LocalAnnotatedBeanHasLBI.java | 3 ++- .../rules/PersistentTimerInEjbLite.java | 8 ++-- .../rules/RemoteAnnotatedBeanHasRBI.java | 3 ++- .../rules/SessionSynchImplementedBySFSBOnly.java | 3 ++- ...ValueNotSpecifiedForRemoteAnnotationInterface.java | 5 - .../modules/j2ee/ejbverification/rules/WSisSLSB.java | 5 - .../web/beans/actions/InterceptorGenerator.java | 2 +- .../beans/analysis/analyzer/type/Bundle.properties| 2 +- .../web/beans/hints/CreateInterceptorBinding.java | 2 +- .../jakarta/web/beans/hints/CreateQualifierFix.java | 2 +- .../jakarta/web/beans/resources/Interceptor.template | 2 +- .../modules/web/beans/actions/InterceptorFactory.java | 1 - .../web/beans/actions/InterceptorGenerator.java | 1 - .../web/beans/analysis/analyzer/AnnotationUtil.java | 1 - .../analysis/analyzer/type/ManagedBeansAnalizer.java | 1 - .../modules/web/beans/hints/CreateQualifier.java | 1 - .../beans/impl/model/AnnotationObjectProvider.java| 1 - .../modules/web/beans/impl/model/BeansFilter.java | 1 - .../web/beans/impl/model/EnableBeansFilter.java | 1 - .../beans/impl/model/EventInjectionPointLogic.java| 1 - .../beans/impl/model/FieldInjectionPointLogic.java| 1 - .../beans/impl/model/InterceptorBindingChecker.java | 1 - .../web/beans/impl/model/InterceptorObject.java | 1 - .../web/beans/impl/model/MemberBindingFilter.java | 1 - .../impl/model/ParameterInjectionPointLogic.java | 1 - .../modules/web/beans/impl/model/ScopeChecker.java| 1 - .../web/beans/impl/model/StereotypeChecker.java | 1 - .../impl/model/results/InterceptorsResultImpl.java| 1 - .../web/beans/impl/model/results/ResultImpl.java | 1 - .../modules/web/beans/navigation/BindingsPanel.java | 1 - .../modules/web/beans/navigation/DecoratorsPanel.java | 1 - .../modules/web/beans/navigation/ObserversPanel.java | 1 - .../navigation/actions/WebBeansActionHelper.java | 1 - 38 files changed, 57 insertions(+), 42 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 (25e09a02c8 -> a77e2fdf92)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 25e09a02c8 Update issue report template for NB21 release add 77257c4b1b Enable code completion in JSF and JSP pages in Jakarta based projects add ad8920c84d Cleanup warning/whitespace new a77e2fdf92 Merge pull request #6985 from matthiasblaesing/jsp_jakarta3 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/web/core/syntax/JSPProcessor.java | 75 +--- .../modules/web/core/syntax/JspSyntaxSupport.java | 202 +++-- .../web/core/syntax/SimplifiedJspServlet.java | 81 - .../web/jsf/editor/el/FaceletsELPlugin.java| 129 +++-- 4 files changed, 245 insertions(+), 242 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) 01/01: Merge pull request #6985 from matthiasblaesing/jsp_jakarta3
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit a77e2fdf9240c13c30176591d639b9aa842f6f5c Merge: 25e09a02c8 ad8920c84d Author: Matthias Bläsing AuthorDate: Sat Feb 24 14:36:41 2024 +0100 Merge pull request #6985 from matthiasblaesing/jsp_jakarta3 Enable code completion in JSF and JSP pages in Jakarta based projects .../modules/web/core/syntax/JSPProcessor.java | 75 +--- .../modules/web/core/syntax/JspSyntaxSupport.java | 202 +++-- .../web/core/syntax/SimplifiedJspServlet.java | 81 - .../web/jsf/editor/el/FaceletsELPlugin.java| 129 +++-- 4 files changed, 245 insertions(+), 242 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 (0300e20e43 -> f77c26c054)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 0300e20e43 Merge pull request #7089 from MartinBalin/master add 1699f94992 Enable Servlet/Filter/Listener generation for Jakarta based projects add ba4fce8062 Cleanup warning/whitespace add f77c26c054 Merge pull request #6984 from matthiasblaesing/jakarta_servlet No new revisions were added by this update. Summary of changes: .../modules/web/core/api/JspColoringData.java | 1 - .../web/core/palette/JspPaletteUtilities.java | 29 +++--- .../web/core/palette/items/GetProperty.java| 61 +++- .../resources/templates/AdvancedFilter.template| 80 ++-- .../resources/templates/BodyTagHandler.template| 63 +++-- .../web/core/resources/templates/Servlet.template | 29 -- .../resources/templates/ServletListener.template | 7 ++ .../core/resources/templates/SimpleFilter.template | 55 +++ .../resources/templates/SimpleTagHandler.template | 9 +- .../netbeans/modules/web/wizards/Bundle.properties | 6 +- .../modules/web/wizards/ListenerGenerator.java | 85 ++--- .../modules/web/wizards/ListenerIterator.java | 57 .../modules/web/wizards/ListenerPanel.java | 70 -- .../modules/web/wizards/ServletIterator.java | 103 + .../modules/web/wizards/TagHandlerIterator.java| 74 +-- 15 files changed, 461 insertions(+), 268 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) 01/01: Merge pull request #7070 from matthiasblaesing/git-new-file-ignore-copy
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 7575e886cb3d6b6aa5c29768b6e397c45ee543bc Merge: 5de8e61a01 38303f167b Author: Matthias Bläsing AuthorDate: Wed Feb 21 19:24:14 2024 +0100 Merge pull request #7070 from matthiasblaesing/git-new-file-ignore-copy New file created by copy/paste in git repo ignores commit exclusion flag .github/workflows/main.yml | 3 + ide/git/nbproject/project.properties | 13 +- .../modules/git/FilesystemInterceptor.java | 8 +- .../netbeans/modules/git/AbstractGitTestCase.java | 106 +++-- .../netbeans/modules/git/ExternalChangesTest.java | 2 +- .../modules/git/FilesystemInterceptorTest.java | 173 - .../src/org/netbeans/modules/git/StatusTest.java | 9 +- .../netbeans/modules/git/VersioningQueryTest.java | 24 +-- .../org/netbeans/modules/git/getTopmostTest.java | 55 +-- .../git/ui/repository/remote/ConnectTest.java | 2 +- 10 files changed, 228 insertions(+), 167 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 (5de8e61a01 -> 7575e886cb)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 5de8e61a01 Merge pull request #7090 from dbalek/dbalek/micronaut-duplicate-endpoints-warnings add 820558e848 Fix git some git unittests add 38303f167b New file created by copy/paste in git repo ignores commit exclusion flag new 7575e886cb Merge pull request #7070 from matthiasblaesing/git-new-file-ignore-copy 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 | 3 + ide/git/nbproject/project.properties | 13 +- .../modules/git/FilesystemInterceptor.java | 8 +- .../netbeans/modules/git/AbstractGitTestCase.java | 106 +++-- .../netbeans/modules/git/ExternalChangesTest.java | 2 +- .../modules/git/FilesystemInterceptorTest.java | 173 - .../src/org/netbeans/modules/git/StatusTest.java | 9 +- .../netbeans/modules/git/VersioningQueryTest.java | 24 +-- .../org/netbeans/modules/git/getTopmostTest.java | 55 +-- .../git/ui/repository/remote/ConnectTest.java | 2 +- 10 files changed, 228 insertions(+), 167 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) 01/01: Merge pull request #7060 from pedro-w/issue-7057
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit e4b02bd8bd98ebdde47a5a24b1d184c373c5ea4f Merge: d30134f8f7 d6a1168f86 Author: Matthias Bläsing AuthorDate: Tue Feb 13 20:22:39 2024 +0100 Merge pull request #7060 from pedro-w/issue-7057 Add null check on originalEncoding parameter of EncodingModel .../spi/project/ui/support/ProjectCustomizer.java | 39 -- .../project/ui/support/ProjectCustomizerTest.java | 9 + 2 files changed, 30 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 (d30134f8f7 -> e4b02bd8bd)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from d30134f8f7 Merge pull request #7037 from sdedic/gradle/multiproperty-getter-npe add d6a1168f86 Add null check on originalEncoding parameter new e4b02bd8bd Merge pull request #7060 from pedro-w/issue-7057 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: .../spi/project/ui/support/ProjectCustomizer.java | 39 -- .../project/ui/support/ProjectCustomizerTest.java | 9 + 2 files changed, 30 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 (cc9cb19ca8 -> 7349b967ad)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from cc9cb19ca8 Merge pull request #6933 from
neilcsmith-net/native-launcher-1-94a19f0
new 7e428817e0 JShell: Drop libs.jshell.compile and limit use of binary
jshell-9.jar to lib.jshell.agent
new 27f4b55486 JShell: Improve error reporting when target VM fails to
start
new 3f36888fd8 JShell: Fix detection of modular project
new 3fd74a5888 Reenable jshell.support test integration into github-actions
new 7349b967ad Merge pull request #6905 from
matthiasblaesing/jshell_classpath
The 9615 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 |4 +-
.../nbcode/nbproject/platform.properties |1 -
java/jshell.support/nbproject/project.properties |5 +-
java/jshell.support/nbproject/project.xml | 12 +-
.../modules/jshell/editor/CompletionFilter.java| 55 +-
.../modules/jshell/project/ShellProjectUtils.java | 11 +-
.../modules/jshell/support/ShellSession.java | 56 +-
.../netbeans/modules/jshell/tool/JShellTool.java | 176 +++-
.../netbeans/modules/jshell/tool/l10n.properties |1 +
.../modules/jshell/support/ContentParserTest.java |4 +-
java/lib.jshell.agent/build.xml| 15 +-
.../external/binaries-list |0
.../external/jshell-9-license.txt |0
java/lib.jshell.agent/nbproject/project.properties |2 +-
java/lib.jshell.agent/nbproject/project.xml|5 -
java/libs.jshell.compile/arch.xml | 1025
java/libs.jshell.compile/build.xml | 24 -
java/libs.jshell.compile/manifest.mf |6 -
.../nbproject/org-netbeans-libs-jshell-compile.sig | 646
.../nbproject/project.properties | 29 -
java/libs.jshell.compile/nbproject/project.xml | 52 -
.../src/org/netbeans/libs/jshell/Bundle.properties | 31 -
nbbuild/cluster.properties |1 -
nbbuild/jms-config/tools.flags |1 +
24 files changed, 253 insertions(+), 1909 deletions(-)
rename java/{libs.jshell.compile => lib.jshell.agent}/external/binaries-list
(100%)
rename java/{libs.jshell.compile =>
lib.jshell.agent}/external/jshell-9-license.txt (100%)
delete mode 100644 java/libs.jshell.compile/arch.xml
delete mode 100644 java/libs.jshell.compile/build.xml
delete mode 100644 java/libs.jshell.compile/manifest.mf
delete mode 100644
java/libs.jshell.compile/nbproject/org-netbeans-libs-jshell-compile.sig
delete mode 100644 java/libs.jshell.compile/nbproject/project.properties
delete mode 100644 java/libs.jshell.compile/nbproject/project.xml
delete mode 100644
java/libs.jshell.compile/src/org/netbeans/libs/jshell/Bundle.properties
-
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 (bf8131cc09 -> e80319f334)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from bf8131cc09 Merge pull request #6850 from mbien/ci-action-updates new 08ffadc352 nb-javac: Check for Abort/CancelAbort in exception cause chain new 59ee4e1b6b Cleanup NetBeans warnings new e80319f334 Merge pull request #6865 from matthiasblaesing/javac_abort The 9600 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/source/indexing/VanillaCompileWorker.java | 179 ++--- .../modules/java/source/parsing/JavacParser.java | 93 ++- .../modules/java/source/util/AbortChecker.java | 57 +++ 3 files changed, 195 insertions(+), 134 deletions(-) create mode 100644 java/java.source.base/src/org/netbeans/modules/java/source/util/AbortChecker.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 (50812d5d25 -> 3ac5fab873)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 50812d5d25 Merge pull request #6872 from matthiasblaesing/followup_6602 new 8b86eb6300 Entities from Database: Improve DB connection selection new d651890bf5 Payara: Prevent NullPointerException when fetching database connections new 3ac5fab873 Merge pull request #6888 from matthiasblaesing/jpa2 The 9573 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/javaee/db/DbUtil.java| 2 +- .../persistence/wizard/fromdb/Bundle.properties| 3 + .../wizard/fromdb/DatabaseTablesPanel.form | 59 +++-- .../wizard/fromdb/DatabaseTablesPanel.java | 255 - 4 files changed, 198 insertions(+), 121 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 (b2db3a6941 -> 50812d5d25)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from b2db3a6941 Let NetBeans know that Gradle 8.5 is good with Java 21 new ed0a5f94aa WildflyDeploymentManager: Revert switch from WeakHashMap with synchronisation to ConcurrentHashMap new eef4194016 Wildfly Integration: Followup cleanup after dca223ab08b6d96afc81a9a03c4bf97bf238a215 new 50812d5d25 Merge pull request #6872 from matthiasblaesing/followup_6602 The 9570 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: .../javaee/wildfly/WildflyDeploymentManager.java | 8 +-- .../wildfly/ide/WildflyJ2eePlatformFactory.java| 35 -- .../wildfly/ide/ui/AddServerLocationPanel.java | 17 + .../ide/ui/AddServerLocationVisualPanel.java | 15 ++--- .../wildfly/ide/ui/AddServerPropertiesPanel.java | 17 + .../ide/ui/AddServerPropertiesVisualPanel.java | 78 ++ .../ide/ui/WildflyInstantiatingIterator.java | 25 +++ 7 files changed, 43 insertions(+), 152 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: Drop special mimetype for karma test configuration
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 b391a63455 Drop special mimetype for karma test configuration
new bd150719b9 Merge pull request #6883 from
matthiasblaesing/javascript_config
b391a63455 is described below
commit b391a63455c7b7ff202f524631e3abfb788e5684
Author: Matthias Bläsing
AuthorDate: Tue Dec 26 22:44:26 2023 +0100
Drop special mimetype for karma test configuration
The karma test configuration (default filename: karma.conf.js) was
mapped to the special mimetype text/karmaconf+javascript.
The mimeresolver for that matched for all files, that ended with js and
contained "karma" or "conf". This collides with the JS editor
infrastructure, that does not allow for this subclassing. Oen such
problem was, that for file JS folding was provided, but the fold types
were not provided, raising exceptions from GsfFoldManager.
Instead of special casing the file to a mimetype, the action is now
tied to all JS files, but only activated (and visible) on karma*.conf.js
files.
Closes: #6879
---
webcommon/javascript.karma/manifest.mf | 1 -
.../karma/resources/karmaconf-resolver.xml | 31 ---
.../modules/javascript/karma/resources/layer.xml | 36 --
.../karma/ui/actions/SetKarmaConfAction.java | 10 --
.../modules/javascript/karma/util/KarmaUtils.java | 2 --
5 files changed, 7 insertions(+), 73 deletions(-)
diff --git a/webcommon/javascript.karma/manifest.mf
b/webcommon/javascript.karma/manifest.mf
index 7adb992963..d3aaabd060 100644
--- a/webcommon/javascript.karma/manifest.mf
+++ b/webcommon/javascript.karma/manifest.mf
@@ -1,6 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.javascript.karma/0
-OpenIDE-Module-Layer: org/netbeans/modules/javascript/karma/resources/layer.xml
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/javascript/karma/resources/Bundle.properties
OpenIDE-Module-Specification-Version: 0.39
AutoUpdate-Show-In-Client: false
diff --git
a/webcommon/javascript.karma/src/org/netbeans/modules/javascript/karma/resources/karmaconf-resolver.xml
b/webcommon/javascript.karma/src/org/netbeans/modules/javascript/karma/resources/karmaconf-resolver.xml
deleted file mode 100644
index 2170ad8847..00
---
a/webcommon/javascript.karma/src/org/netbeans/modules/javascript/karma/resources/karmaconf-resolver.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-http://www.netbeans.org/dtds/mime-resolver-1_1.dtd;>
-
-
-
-
-
-
-
-
-
diff --git
a/webcommon/javascript.karma/src/org/netbeans/modules/javascript/karma/resources/layer.xml
b/webcommon/javascript.karma/src/org/netbeans/modules/javascript/karma/resources/layer.xml
deleted file mode 100644
index e7f23e6899..00
---
a/webcommon/javascript.karma/src/org/netbeans/modules/javascript/karma/resources/layer.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-http://www.netbeans.org/dtds/filesystem-1_2.dtd;>
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git
a/webcommon/javascript.karma/src/org/netbeans/modules/javascript/karma/ui/actions/SetKarmaConfAction.java
b/webcommon/javascript.karma/src/org/netbeans/modules/javascript/karma/ui/actions/SetKarmaConfAction.java
index 8b0cf862ba..d28cc93c5e 100644
---
a/webcommon/javascript.karma/src/org/netbeans/modules/javascript/karma/ui/actions/SetKarmaConfAction.java
+++
b/webcommon/javascript.karma/src/org/netbeans/modules/javascript/karma/ui/actions/SetKarmaConfAction.java
@@ -41,8 +41,8 @@ import org.openide.util.NbBundle;
@ActionID(id =
"org.netbeans.modules.javascript.karma.ui.actions.SetKarmaConfAction", category
= "Unit Tests")
@ActionRegistration(displayName = "#SetKarmaConfAction.name", lazy = false)
@ActionReferences({
-@ActionReference(path = "Editors/text/karmaconf+javascript/Popup",
position = 907),
-@ActionReference(path = "Loaders/text/karmaconf+javascript/Actions",
position = 157),
+@ActionReference(path = "Editors/text/javascript/Popup", position = 907),
+@ActionReference(path = "Loaders/text/javascript/Actions", position = 157),
})
public final class SetKarmaConfAction extends AbstractAction implements
ContextAwareAction {
@@ -59,7 +59,11 @@ public final class SetKarmaConfAction extends AbstractAction
implements ContextA
public SetKarmaConfAction(Project project, FileObject karmaConfJs) {
this.project = project;
this.karmaConfJs = karmaConfJs;
-setEnabled(karmaConfJs != null);
+setEnabled(
(netbeans) branch master updated: Git client: Enable forced pushes for configured push and push to upstream
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 729f4dcb75 Git client: Enable forced pushes for configured push and
push to upstream
new 296b2bff0a Merge pull request #6823 from matthiasblaesing/git
729f4dcb75 is described below
commit 729f4dcb75e9d77c415406a8b3ca673f51933673
Author: Matthias Bläsing
AuthorDate: Sat Nov 11 14:20:54 2023 +0100
Git client: Enable forced pushes for configured push and push to upstream
---
ide/git/nbproject/project.xml | 2 +-
.../modules/git/ui/fetch/BranchMapping.java| 10 ++---
.../modules/git/ui/fetch/FetchBranchesStep.java| 2 +-
.../modules/git/ui/fetch/PullBranchesStep.java | 2 +-
.../netbeans/modules/git/ui/push/PushAction.java | 2 +
.../modules/git/ui/push/PushBranchesStep.java | 8 ++--
.../netbeans/modules/git/ui/push/PushMapping.java | 36 ++--
.../modules/git/ui/push/PushToUpstreamAction.java | 49 +-
.../netbeans/modules/git/ui/push/PushWizard.java | 2 +-
.../modules/git/ui/selectors/Bundle.properties | 5 ++-
.../modules/git/ui/selectors/ItemSelector.java | 28 ++---
.../modules/git/ui/selectors/ItemsPanel.form | 12 +++---
.../modules/git/ui/selectors/ItemsPanel.java | 12 +++---
.../org/netbeans/modules/git/utils/GitUtils.java | 7 +++-
ide/libs.git/apichanges.xml| 19 +
ide/libs.git/manifest.mf | 2 +-
.../libs/git/jgit/commands/PushCommand.java| 12 +-
.../netbeans/libs/git/jgit/commands/PushTest.java | 4 +-
18 files changed, 143 insertions(+), 71 deletions(-)
diff --git a/ide/git/nbproject/project.xml b/ide/git/nbproject/project.xml
index 2a3a8514c8..9bc4b97802 100644
--- a/ide/git/nbproject/project.xml
+++ b/ide/git/nbproject/project.xml
@@ -53,7 +53,7 @@
1
-1.31
+1.58
diff --git a/ide/git/src/org/netbeans/modules/git/ui/fetch/BranchMapping.java
b/ide/git/src/org/netbeans/modules/git/ui/fetch/BranchMapping.java
index 248a5fe834..08d3122e26 100644
--- a/ide/git/src/org/netbeans/modules/git/ui/fetch/BranchMapping.java
+++ b/ide/git/src/org/netbeans/modules/git/ui/fetch/BranchMapping.java
@@ -49,7 +49,7 @@ public class BranchMapping extends ItemSelector.Item {
this.remoteBranchName = remoteBranchName;
this.localBranch = localBranch;
this.remote = remote;
-if (isDeletion()) {
+if (isDestructive()) {
// to remove
label = MessageFormat.format(BRANCH_DELETE_MAPPING_LABEL,
localBranch.getName(), "R");
@@ -93,7 +93,7 @@ public class BranchMapping extends ItemSelector.Item {
}
public String getRefSpec () {
-if (isDeletion()) {
+if (isDestructive()) {
return GitUtils.getDeletedRefSpec(localBranch);
} else {
return GitUtils.getRefSpec(remoteBranchName,
remote.getRemoteName());
@@ -125,12 +125,12 @@ public class BranchMapping extends ItemSelector.Item {
}
if(t instanceof BranchMapping) {
BranchMapping other = (BranchMapping) t;
-if (isDeletion() && other.isDeletion()) {
+if (isDestructive() && other.isDestructive()) {
return
localBranch.getName().compareTo(other.localBranch.getName());
-} else if (isDeletion() && !other.isDeletion()) {
+} else if (isDestructive() && !other.isDestructive()) {
// deleted branches should be at the bottom
return 1;
-} else if (!isDeletion() && other.isDeletion()) {
+} else if (!isDestructive() && other.isDestructive()) {
// deleted branches should be at the bottom
return -1;
} else {
diff --git
a/ide/git/src/org/netbeans/modules/git/ui/fetch/FetchBranchesStep.java
b/ide/git/src/org/netbeans/modules/git/ui/fetch/FetchBranchesStep.java
index 2bb1c983e5..2fdd6a348d 100644
--- a/ide/git/src/org/netbeans/modules/git/ui/fetch/FetchBranchesStep.java
+++ b/ide/git/src/org/netbeans/modules/git/ui/fetch/FetchBranchesStep.java
@@ -228,7 +228,7 @@ public class FetchBranchesStep extends AbstractWizardPanel
implements WizardDesc
static String getDeletedBranchesMessage (List
selectedBranches) {
StringBuilder sb = new StringBuilder(100);
for (BranchMapping m : selectedBranches) {
-if (m.isDeletion()) {
+if (m.isDestructive()) {
sb.append(Bundle.MSG_FetchBranchesStep_toBeDeletedBranch(m.getLocalBranch().ge
(netbeans) branch master updated: TaskList Model issues broken table model change events
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 0b9c24ff09 TaskList Model issues broken table model change events
new 0291513733 Merge pull request #6882 from
matthiasblaesing/tasklist-tablemodel-events
0b9c24ff09 is described below
commit 0b9c24ff09791eaf127035188fec1ea86f02770b
Author: Matthias Bläsing
AuthorDate: Tue Dec 26 17:52:35 2023 +0100
TaskList Model issues broken table model change events
With JDK21 validation of removeIndexInterval and addIndexInterval
methods was improved. This reveals an issue in the table model change
events, that are published by the TaskListModel. For example it was
observed, that the startRow and endRow indices were issued in the
wrong order.
This results in:
java.lang.IndexOutOfBoundsException: index or length is negative
at
java.desktop/javax.swing.DefaultListSelectionModel.insertIndexInterval(DefaultListSelectionModel.java:656)
at
java.desktop/javax.swing.JTable.tableRowsInserted(JTable.java:4539)
at java.desktop/javax.swing.JTable.tableChanged(JTable.java:4475)
at
java.desktop/javax.swing.table.AbstractTableModel.fireTableChanged(AbstractTableModel.java:302)
at
java.desktop/javax.swing.table.AbstractTableModel.fireTableRowsInserted(AbstractTableModel.java:237)
at
org.netbeans.modules.tasklist.ui.TaskListModel$1.run(TaskListModel.java:143)
at
java.desktop/java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:318)
at
java.desktop/java.awt.EventQueue.dispatchEventImpl(EventQueue.java:773)
---
.../modules/tasklist/ui/TaskListModel.java | 112 +++--
1 file changed, 60 insertions(+), 52 deletions(-)
diff --git
a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListModel.java
b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListModel.java
index 9d76326002..6fac576c8d 100644
--- a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListModel.java
+++ b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListModel.java
@@ -20,6 +20,7 @@
package org.netbeans.modules.tasklist.ui;
import java.awt.EventQueue;
+import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import javax.swing.table.AbstractTableModel;
@@ -37,14 +38,14 @@ import org.openide.util.NbBundle;
class TaskListModel extends AbstractTableModel implements TaskList.Listener {
protected TaskList taskList;
-
+
protected static final int COL_GROUP = 0;
protected static final int COL_DESCRIPTION = 1;
protected static final int COL_FILE = 2;
protected static final int COL_LOCATION = 3;
-// internal list of tasks - needed to recognize deleted row (deleted tasks
aren't in taskList when taskRemoved method "arrive") #204655
+// listOfTasks holds the list of tasks relevant for the Swing components.
It
+// is a copy of the task held by the TaskList instance
private List listOfTasks;
-private final Object lock = new Object();
/** Creates a new instance of TaskListModel */
@@ -58,8 +59,7 @@ class TaskListModel extends AbstractTableModel implements
TaskList.Listener {
@Override
public int getRowCount() {
-final List list = taskList.getTasks();
-return list.size();
+return listOfTasks.size();
}
@Override
@@ -115,65 +115,73 @@ class TaskListModel extends AbstractTableModel implements
TaskList.Listener {
}
protected Task getTaskAtRow( int row ) {
-synchronized (lock) {
-final List list = taskList.getTasks();
-if (list.size() > row) {
-return list.get(row);
-} else {
-return null;
-}
+if (listOfTasks.size() > row) {
+return listOfTasks.get(row);
+} else {
+return null;
}
}
@Override
-public void tasksAdded( final List tasks ) {
-if( tasks.isEmpty() )
-return;
-final int startRow;
-final int endRow;
-synchronized (lock) {
-startRow = taskList.getTasks().indexOf(tasks.get(0));
-endRow = taskList.getTasks().indexOf(tasks.get(tasks.size() - 1));
-listOfTasks = taskList.getTasks();
-}
-if( startRow > -1 && endRow > -1 ) {
-EventQueue.invokeLater(new Runnable() {
-@Override
-public void run() {
-fireTableRowsInserted(startRow, endRow);
-}
-});
+public void tasksAdded(final List tasks) {
+if (! tasks.isEmpty()) {
+fireTasksChanged(true, tasks,
(netbeans) branch master updated (2141d37d04 -> babcc3d5c1)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 2141d37d04 Merge pull request #6873 from junichi11/php83-marking-overridden-methods new 5572ad0dc0 Prevent NullPointerException if codeAction returns null (observed on rust-analyser 0.3.1756-standalone) new c36a8ad60d LSP-Client: After server initialization is done send initialized notification to server new babcc3d5c1 Merge pull request #6856 from matthiasblaesing/lsp_improvement The 9491 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/lsp/client/LSPBindings.java | 68 -- .../lsp/client/bindings/LanguageClientImpl.java| 19 -- 2 files changed, 64 insertions(+), 23 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: CSS-Refactoring: Fix NullPointerException from folder/file renaming
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 4cc1931e18 CSS-Refactoring: Fix NullPointerException from folder/file
renaming
new 71fb2eda10 Merge pull request #6837 from
matthiasblaesing/css_refactoring_exception
4cc1931e18 is described below
commit 4cc1931e182a7c96d168bfc4d924df997bc9f024
Author: Matthias Bläsing
AuthorDate: Tue Dec 12 21:32:32 2023 +0100
CSS-Refactoring: Fix NullPointerException from folder/file renaming
There are two very different supported refactorings supported in the
CSS context:
1. CSS "internal" refactorings, which are completely rooted and handled
inside the CSS modules (renaming classes, ids, colors, elements)
2. Renaming files/folders
The second category caused NullPointerExceptions because the
refactoring plugin expected a special context object only provided for
the first set of refactorings.
---
.../refactoring/CssRenameRefactoringPlugin.java| 38 +-
1 file changed, 23 insertions(+), 15 deletions(-)
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssRenameRefactoringPlugin.java
b/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssRenameRefactoringPlugin.java
index 0a2e3379a1..0d58a64847 100644
---
a/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssRenameRefactoringPlugin.java
+++
b/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssRenameRefactoringPlugin.java
@@ -114,7 +114,19 @@ public class CssRenameRefactoringPlugin implements
RefactoringPlugin {
@Override
public Problem prepare(final RefactoringElementsBag refactoringElements) {
-CssProjectSupport sup =
CssProjectSupport.findFor(context.getFileObject());
+FileObject fileObject;
+
+if (context != null) {
+fileObject = context.getFileObject();
+} else {
+fileObject = lookup.lookup(FileObject.class);
+}
+
+if (fileObject == null) {
+return null;
+}
+
+CssProjectSupport sup = CssProjectSupport.findFor(fileObject);
if (sup == null) {
return null;
}
@@ -173,20 +185,16 @@ public class CssRenameRefactoringPlugin implements
RefactoringPlugin {
}
-} else {
-FileObject fileObject = lookup.lookup(FileObject.class);
-
-if(fileObject != null && !fileObject.isFolder()) {
-//refactor a file in explorer
-refactorFile(modificationResult, fileObject, index);
-} else if (fileObject != null && fileObject.isFolder()) {
-//refactor a folder in explorer
-refactorFolder(modificationResult, fileObject, index);
-//add folder rename element implementation, there doesn't seem
to a default one
-//like for file rename
-// Disabled RenameFolder as it collides with FileRenamePlugin
see #187635
-//refactoringElements.add(refactoring, new
RenameFolder(folderContext.getFileObject()));
-}
+} else if (!fileObject.isFolder()) {
+//refactor a file in explorer
+refactorFile(modificationResult, fileObject, index);
+} else if (fileObject.isFolder()) {
+//refactor a folder in explorer
+refactorFolder(modificationResult, fileObject, index);
+//add folder rename element implementation, there doesn't seem to
a default one
+//like for file rename
+// Disabled RenameFolder as it collides with FileRenamePlugin see
#187635
+//refactoringElements.add(refactoring, new
RenameFolder(folderContext.getFileObject()));
}
//commit the transaction and add the differences to the result
-
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: Fix errors from java multi-file source launcher
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 0f346ba27b Fix errors from java multi-file source launcher
new ac3936a4bd Merge pull request #6832 from
matthiasblaesing/fix_multifile_launcher2
0f346ba27b is described below
commit 0f346ba27bd5eacf17a7f169d343e42304ed57ed
Author: Matthias Bläsing
AuthorDate: Sun Dec 10 18:05:16 2023 +0100
Fix errors from java multi-file source launcher
- Guard against problem writing VM attributes
(check if filesystem is writeable and reduce log severity to info=
- Check FileObject for validity before trying to read from it
---
.../netbeans/modules/java/file/launcher/SharedRootData.java | 11 +--
.../java/file/launcher/queries/MultiSourceRootProvider.java | 2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git
a/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/SharedRootData.java
b/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/SharedRootData.java
index 9939a96e81..3c9d909922 100644
---
a/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/SharedRootData.java
+++
b/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/SharedRootData.java
@@ -25,6 +25,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.modules.java.file.launcher.api.SourceLauncher;
@@ -43,6 +45,8 @@ import org.openide.util.Exceptions;
*/
public class SharedRootData {
+private static final Logger LOG =
Logger.getLogger(SharedRootData.class.getName());
+
private static final Map root2Data = new
HashMap<>();
public static synchronized void ensureRootRegistered(FileObject root) {
@@ -104,11 +108,14 @@ public class SharedRootData {
}
String joinedCommandLine =
SourceLauncher.joinCommandLines(options.values());
try {
-if
(!joinedCommandLine.equals(root.getAttribute(SingleSourceFileUtil.FILE_VM_OPTIONS)))
{
+if (
+!root.getFileSystem().isReadOnly() // Skip read-only FSes
(like JarFileSystem)
+&&
!joinedCommandLine.equals(root.getAttribute(SingleSourceFileUtil.FILE_VM_OPTIONS))
+) {
root.setAttribute(SingleSourceFileUtil.FILE_VM_OPTIONS,
joinedCommandLine);
}
} catch (IOException ex) {
-Exceptions.printStackTrace(ex);
+LOG.log(Level.INFO, "Failed to set " +
SingleSourceFileUtil.FILE_VM_OPTIONS + " for " + root.getPath(), ex);
}
}
diff --git
a/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProvider.java
b/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProvider.java
index 47a8bad00c..7f5061d3fa 100644
---
a/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProvider.java
+++
b/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/queries/MultiSourceRootProvider.java
@@ -92,7 +92,7 @@ public class MultiSourceRootProvider implements
ClassPathProvider {
if (DISABLE_MULTI_SOURCE_ROOT) return null;
synchronized (this) {
//XXX: what happens if there's a Java file in user's home???
-if (file.isData() && "text/x-java".equals(file.getMIMEType())) {
+if (file.isValid() && file.isData() &&
"text/x-java".equals(file.getMIMEType())) {
return file2SourceCP.computeIfAbsent(file, f -> {
try {
String content = new String(file.asBytes(),
FileEncodingQuery.getEncoding(file));
-
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: JS: Enable contiouus completion of JS private members of classes (# prefixed)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 2dba93dc8a JS: Enable contiouus completion of JS private members of
classes (# prefixed)
new 76ba9d1696 Merge pull request #6741 from
matthiasblaesing/js_class_private_completion
2dba93dc8a is described below
commit 2dba93dc8af98c6525500b1bb29ef8debe65a54f
Author: Matthias Bläsing
AuthorDate: Wed Nov 22 20:09:38 2023 +0100
JS: Enable contiouus completion of JS private members of classes (#
prefixed)
The description of issues 214978 and 223050 was manually checked and
behavior seems to be identical between master and this version.
Unittests were run and did not regress.
Closes: #6734
---
.../org/netbeans/modules/javascript2/editor/JsLanguage.java | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsLanguage.java
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsLanguage.java
index e0218805fe..dab743021b 100644
---
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsLanguage.java
+++
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsLanguage.java
@@ -165,11 +165,13 @@ public class JsLanguage extends DefaultLanguageConfig {
public boolean isIdentifierChar(char c) {
return super.isIdentifierChar(c)
// due to CC filtering of DOC annotations - see
GsfCompletionProvider#getCompletableLanguage()
-|| c == '@'; //NOI18N
-// see issue #214978 - it goes to the
CodeTemplateCompletionProvider#query(), it would probably deserve
-// new API in the next release or are we wrongly embedding
the jQuery? For now this fix doesn't look to
-// make troubles to another areas.
-//|| c == '#' || c == ':' || c == '.'; //NOI18N
+|| c == '@' //NOI18N
+|| c == '#' //NOI18N
+ see issue #214978 - it goes to the
CodeTemplateCompletionProvider#query(), it would probably deserve
+ new API in the next release or are we wrongly embedding
the jQuery? For now this fix doesn't look to
+ make troubles to another areas.
+// || c == ':' || c == '.'; //NOI18N
+;
}
@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: Improve code REST code generation JavaEE 9+ environments (jakarta namespace change)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 bf55d4af21 Improve code REST code generation JavaEE 9+ environments
(jakarta namespace change)
new fc952e1f9c Merge pull request #6728 from matthiasblaesing/jakarta2
bf55d4af21 is described below
commit bf55d4af211feeaca77a493c5e2da678e7421010
Author: Matthias Bläsing
AuthorDate: Fri Nov 3 21:33:03 2023 +0100
Improve code REST code generation JavaEE 9+ environments (jakarta namespace
change)
Manually tested were:
- RESTful Java Client
- RESTful Web Services from Entity Classes
- RESTful Web Services from Database
- RESTful Web Services from Pattern
---
.../netbeans/modules/websvc/rest/RestUtils.java| 41 +---
.../websvc/rest/client/ClientJavaSourceHelper.java | 14 +--
.../rest/client/JaxRsGenerationStrategy.java | 70 +++--
.../modules/websvc/rest/codegen/Constants.java | 70 ++---
.../rest/codegen/EntityResourcesGenerator.java | 49 ++---
.../rest/codegen/GenericResourceGenerator.java | 46 +
.../websvc/rest/codegen/RestFacadeMethod.java | 22 ++--
.../modules/websvc/rest/codegen/RestMethod.java| 2 +-
.../codegen/SpringEntityResourcesGenerator.java| 17 ++--
.../websvc/rest/codegen/model/EntityClassInfo.java | 41 +---
.../websvc/rest/codegen/model/SourceModeler.java | 79 ++-
.../codegen/resources/GenericResource.template | 5 +
.../websvc/rest/support/JavaSourceHelper.java | 16 ++-
.../netbeans/modules/websvc/rest/wizard/Util.java | 11 +-
.../rest/wizard/fromdb/EjbFacadeGenerator.java | 112 ++---
.../websvc/rest/wizard/fromdb/Operation.java | 23 +++--
.../websvc/rest/model/api/RestConstants.java | 64 ++--
.../rest/model/impl/RestApplicationsImpl.java | 1 +
.../websvc/rest/model/impl/RestServicesImpl.java | 6 ++
.../modules/websvc/rest/model/impl/Utils.java | 84 +++-
.../modules/websvc/rest/spi/RestSupport.java | 4 +-
.../j2ee/persistence/action/GenerationOptions.java | 68 ++---
.../wizard/fromdb/EntityClassesPanel.java | 7 +-
.../wizard/fromdb/JavaPersistenceGenerator.java| 8 +-
24 files changed, 594 insertions(+), 266 deletions(-)
diff --git
a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/RestUtils.java
b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/RestUtils.java
index 740863c808..18d880bf33 100644
--- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/RestUtils.java
+++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/RestUtils.java
@@ -244,7 +244,8 @@ public class RestUtils {
List annotations =
JavaSourceHelper.getClassAnnotations(rSrc);
for (AnnotationMirror annotation : annotations) {
String cAnonType = annotation.getAnnotationType().toString();
-if (RestConstants.PATH.equals(cAnonType) ) {
+if (RestConstants.PATH_JAKARTA.equals(cAnonType)
+|| RestConstants.PATH.equals(cAnonType)) {
path = getValueFromAnnotation(annotation);
}
}
@@ -253,12 +254,13 @@ public class RestUtils {
public static boolean isStaticResource(JavaSource src) {
List annotations =
JavaSourceHelper.getClassAnnotations(src);
-if (annotations != null && annotations.size() > 0) {
+if (annotations != null) {
for (AnnotationMirror annotation : annotations) {
String classAnonType =
annotation.getAnnotationType().toString();
-if (RestConstants.PATH.equals(classAnonType)) {
+if (RestConstants.PATH_JAKARTA.equals(classAnonType)
+|| RestConstants.PATH.equals(classAnonType)) {
return true;
-}
+}
}
}
return false;
@@ -266,10 +268,11 @@ public class RestUtils {
public static boolean isConverter(JavaSource src) {
List annotations =
JavaSourceHelper.getClassAnnotations(src);
-if (annotations != null && annotations.size() > 0) {
+if (annotations != null) {
for (AnnotationMirror annotation : annotations) {
String classAnonType =
annotation.getAnnotationType().toString();
-if (Constants.XML_ROOT_ELEMENT.equals(classAnonType)) {
+if (Constants.XML_ROOT_ELEMENT.equals(classAnonType)
+||
Constants.XML_ROOT_ELEMENT_JAKARTA.equals(classAnonType)) {
return true;
}
}
@@ -281,12 +284,16 @@ public class RestUtils {
List trees = JavaSourceHe
(netbeans) branch master updated (fc952e1f9c -> 5eea0b63d5)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from fc952e1f9c Merge pull request #6728 from matthiasblaesing/jakarta2 new cd43b48dc3 Update jaxb maven plugin and handle javax and jakarta namespaces new d1b642531a Report missing JAXB compiler problem to the user and inform about option for maven projects new 5eea0b63d5 Merge pull request #6736 from matthiasblaesing/jaxb The 9416 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: .../maven/jaxws/wizards/MavenSchemaCompiler.java | 108 +++-- .../netbeans/modules/xml/jaxb/ui/Bundle.properties | 2 +- .../modules/xml/jaxb/ui/JAXBWizardIterator.java| 10 +- 3 files changed, 90 insertions(+), 30 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: Detect JPA provider on classpath, removing requirement to have it as legacy library
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 0a4be7b6fe Detect JPA provider on classpath, removing requirement to
have it as legacy library
new 1b075fe0c8 Merge pull request #6748 from
matthiasblaesing/jpa_provider_on_classpath
0a4be7b6fe is described below
commit 0a4be7b6fe6532fe818e83ce09a824c9f6ccffd8
Author: Matthias Bläsing
AuthorDate: Fri Nov 24 22:13:57 2023 +0100
Detect JPA provider on classpath, removing requirement to have it as legacy
library
In addition fixes typo in JPA 3.1 detection (duplicate ".class" suffix)
---
.../j2ee/persistence/provider/Provider.java| 2 +-
.../util/PersistenceProviderComboboxHelper.java| 51 --
2 files changed, 38 insertions(+), 15 deletions(-)
diff --git
a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/Provider.java
b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/Provider.java
index 9a5a074067..41ad72980a 100644
---
a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/Provider.java
+++
b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/Provider.java
@@ -84,7 +84,7 @@ public abstract class Provider {
if(ret && version != null)
{
if(Persistence.VERSION_3_1.equals(version)){
-ret &=
cp.findResource("jakarta/persistence/spi/TransformerException.class.class") !=
null;
+ret &=
cp.findResource("jakarta/persistence/spi/TransformerException.class") != null;
} else if(Persistence.VERSION_3_0.equals(version)){
ret &= cp.findResource("jakarta/persistence/Entity.class") !=
null;
} else if (Persistence.VERSION_2_2.equals(version)) {
diff --git
a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/util/PersistenceProviderComboboxHelper.java
b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/util/PersistenceProviderComboboxHelper.java
index e0d7f83796..30ae85ea9d 100644
---
a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/util/PersistenceProviderComboboxHelper.java
+++
b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/util/PersistenceProviderComboboxHelper.java
@@ -35,7 +35,11 @@ import javax.swing.DefaultListCellRenderer;
import javax.swing.JComboBox;
import javax.swing.JList;
import javax.swing.JSeparator;
+import org.netbeans.api.java.classpath.ClassPath;
+import org.netbeans.api.java.project.JavaProjectConstants;
import org.netbeans.api.project.Project;
+import org.netbeans.api.project.ProjectUtils;
+import org.netbeans.api.project.SourceGroup;
import org.netbeans.api.project.libraries.LibrariesCustomizer;
import org.netbeans.modules.j2ee.persistence.dd.common.Persistence;
import org.netbeans.modules.j2ee.persistence.provider.DefaultProvider;
@@ -45,6 +49,7 @@ import
org.netbeans.modules.j2ee.persistence.spi.provider.PersistenceProviderSup
import org.netbeans.modules.j2ee.persistence.wizard.Util;
import
org.netbeans.modules.j2ee.persistence.wizard.library.PersistenceLibraryCustomizer;
import
org.netbeans.modules.j2ee.persistence.wizard.library.PersistenceLibrarySupport;
+import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.openide.util.NbBundle;
import org.openide.util.Parameters;
@@ -79,7 +84,7 @@ public final class PersistenceProviderComboboxHelper {
if (aProviderSupplier == null){
// a java se project
-aProviderSupplier = new DefaultPersistenceProviderSupplier();
+aProviderSupplier = new
DefaultPersistenceProviderSupplier(project);
}
this.project = project;
this.providerSupplier = aProviderSupplier;
@@ -114,8 +119,8 @@ public final class PersistenceProviderComboboxHelper {
providerCombo.addActionListener(new ActionListener() {
-Object currentItem = providerCombo.getSelectedItem();
-int currentIndex = providerCombo.getSelectedIndex();
+private Object currentItem = providerCombo.getSelectedItem();
+private int currentIndex = providerCombo.getSelectedIndex();
@Override
public void actionPerformed(ActionEvent e) {
@@ -290,20 +295,38 @@ public final class PersistenceProviderComboboxHelper {
* for instance for Java SE projects).
*/
private static class DefaultPersistenceProviderSupplier implements
PersistenceProviderSupplier{
-
+
+private final Project project;
+
+public DefaultPersistenceProviderSupplier(Project project) {
+this.project = project;
+}
+
svn commit: r64521 - /dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/ /dev/netbeans/native/netbeans-profiler/1-r24aefa9/ /release/netbeans/native/netbeans-nativeexecution/ /release/netbeans/n
Author: matthiasblaesing Date: Fri Oct 13 20:09:42 2023 New Revision: 64521 Log: Release Apache NetBeans dlight.nativeexecution natives version 1-24aefa9 and lib.profiler natives version 1-24aefa9 https://lists.apache.org/thread/1jzx1nxjk3pgp4fdm6w0mwmx4c0h05ry https://lists.apache.org/thread/8qvsvj2f1b1mg51sc3s5cqzhv4hcyypy Added: release/netbeans/native/netbeans-nativeexecution/ release/netbeans/native/netbeans-nativeexecution/1-24aefa9/ - copied from r64520, dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/ release/netbeans/native/netbeans-profiler/ release/netbeans/native/netbeans-profiler/1-24aefa9/ - copied from r64520, dev/netbeans/native/netbeans-profiler/1-r24aefa9/ Removed: dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/ dev/netbeans/native/netbeans-profiler/1-r24aefa9/ - 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 (78b97f5a5c -> 9805027267)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 78b97f5a5c Merge pull request #6565 from
ebarboni/infradependenciesupdate
new 0a205045cd bump versions in micronaut gradle tests
new 6f8cc2e2a3 Update JGit from 5.7.0 to 6.7.0.
new d32a76e785 Support Fragment-Host manifest entry with version
specification
new 7ff7e8787f Ensure that the org.osgi.framework.executionenvironment
holds all JavaSE entries that match till the current JDK
new 7c134fa3da Expose the jgit support modules (OpenGPG, LFS and JSCH
support) as individual OSGI bundles
new 9805027267 Merge pull request #6544 from matthiasblaesing/osgi-jgit
The 9158 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:
.../data/gradle/artifacts/multi/app/build.gradle | 2 +-
.../data/gradle/artifacts/multi/gradle.properties | 2 +-
.../multi/gradle/wrapper/gradle-wrapper.properties | 2 +-
.../data/gradle/artifacts/multi/oci/build.gradle | 2 +-
.../unit/data/gradle/artifacts/simple/build.gradle | 2 +-
.../data/gradle/artifacts/simple/gradle.properties | 2 +-
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
ide/libs.git/nbproject/project.xml | 10 ++-
.../libs/git/jgit/DelegatingProgressMonitor.java | 4 +
.../libs/git/jgit/JGitSshSessionFactory.java | 10 +--
.../libs/git/jgit/commands/CherryPickCommand.java | 5 +-
.../libs/git/jgit/commands/ExportDiffCommand.java | 3 +-
.../libs/git/jgit/commands/GitCommand.java | 1 -
ide/o.eclipse.jgit.gpg.bc/build.xml| 25 ++
.../external/binaries-list | 2 +-
...se.jgit.gpg.bc-6.7.0.202309050840-r-license.txt | 93 ++
.../manifest.mf| 0
.../nbproject/project.properties | 2 +
.../nbproject/project.xml | 36 -
ide/o.eclipse.jgit.lfs/build.xml | 25 ++
.../external/binaries-list | 2 +-
...lipse.jgit.lfs-6.7.0.202309050840-r-license.txt | 93 ++
.../manifest.mf| 0
.../nbproject/project.properties | 2 +
.../nbproject/project.xml | 29 ++-
ide/o.eclipse.jgit.ssh.jsch/build.xml | 25 ++
.../external/binaries-list | 2 +-
jgit.ssh.jsch-6.7.0.202309050840-r-license.txt | 93 ++
ide/o.eclipse.jgit.ssh.jsch/manifest.mf| 1 +
.../nbproject/project.properties | 2 +
.../nbproject/project.xml | 29 ++-
ide/o.eclipse.jgit/build.xml | 24 +-
ide/o.eclipse.jgit/external/binaries-list | 2 +-
...g.eclipse.jgit-5.7.0.202003110725-r-license.txt | 35
...g.eclipse.jgit-6.7.0.202309050840-r-license.txt | 93 ++
ide/o.eclipse.jgit/nbproject/project.properties| 2 +
ide/o.eclipse.jgit/nbproject/project.xml | 23 +-
nbbuild/cluster.properties | 3 +
nbbuild/licenses/EDL-1.0-jgit | 87
.../src/org/netbeans/core/netigso/Netigso.java | 19 +++--
.../netigso/NetigsoLoaderOSGiFragmentTest.java | 36 +
.../netbeans/modules/netbinox/NetbinoxFactory.java | 44 ++
42 files changed, 702 insertions(+), 174 deletions(-)
create mode 100644 ide/o.eclipse.jgit.gpg.bc/build.xml
copy ide/{o.eclipse.jgit => o.eclipse.jgit.gpg.bc}/external/binaries-list (88%)
create mode 100644
ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-6.7.0.202309050840-r-license.txt
copy ide/{o.eclipse.jgit => o.eclipse.jgit.gpg.bc}/manifest.mf (100%)
copy ide/{o.eclipse.jgit =>
o.eclipse.jgit.gpg.bc}/nbproject/project.properties (88%)
copy ide/{o.eclipse.jgit => o.eclipse.jgit.gpg.bc}/nbproject/project.xml (80%)
create mode 100644 ide/o.eclipse.jgit.lfs/build.xml
copy ide/{o.eclipse.jgit => o.eclipse.jgit.lfs}/external/binaries-list (88%)
create mode 100644
ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-6.7.0.202309050840-r-license.txt
copy ide/{o.eclipse.jgit => o.eclipse.jgit.lfs}/manifest.mf (100%)
copy ide/{o.eclipse.jgit => o.eclipse.jgit.lfs}/nbproject/project.properties
(89%)
copy ide/{o.eclipse.jgit => o.eclipse.jgit.lfs}/nbproject/project.xml (71%)
create mode 100644 ide/o.eclipse.jgit.ssh.jsch/build.xml
copy ide/{o.eclipse.jgit => o.eclipse.jgit.ssh.jsch}/external/binaries-list
(88%)
create mode 100644
ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsc
svn commit: r64462 - in /dev/netbeans/native: netbeans-nativeexecution/1-r24aefa9/ netbeans-profiler/1-r24aefa9/
Author: matthiasblaesing Date: Tue Oct 10 18:27:58 2023 New Revision: 64462 Log: Apache NetBeans native profile and NetBeans native execution version 1-24aefa9 staging Added: dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/ dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-binaries-1-24aefa9.zip (with props) dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-binaries-1-24aefa9.zip.asc dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-binaries-1-24aefa9.zip.sha512 dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-sources-1-24aefa9.zip (with props) dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-sources-1-24aefa9.zip.asc dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-sources-1-24aefa9.zip.sha512 dev/netbeans/native/netbeans-profiler/1-r24aefa9/ dev/netbeans/native/netbeans-profiler/1-r24aefa9/profiler-external-binaries-1-24aefa9.zip (with props) dev/netbeans/native/netbeans-profiler/1-r24aefa9/profiler-external-binaries-1-24aefa9.zip.asc dev/netbeans/native/netbeans-profiler/1-r24aefa9/profiler-external-binaries-1-24aefa9.zip.sha512 dev/netbeans/native/netbeans-profiler/1-r24aefa9/profiler-external-sources-1-24aefa9.zip (with props) dev/netbeans/native/netbeans-profiler/1-r24aefa9/profiler-external-sources-1-24aefa9.zip.asc dev/netbeans/native/netbeans-profiler/1-r24aefa9/profiler-external-sources-1-24aefa9.zip.sha512 Added: dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-binaries-1-24aefa9.zip == Binary file - no diff available. Propchange: dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-binaries-1-24aefa9.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-binaries-1-24aefa9.zip.asc == --- dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-binaries-1-24aefa9.zip.asc (added) +++ dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-binaries-1-24aefa9.zip.asc Tue Oct 10 18:27:58 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJQBAABCgA6FiEE7pXDF0J0NrnsMBopoEo9o77SkDYFAmUlkwQcHG1hdHRoaWFz +YmxhZXNpbmdAYXBhY2hlLm9yZwAKCRCgSj2jvtKQNo6ZEACpwuHT1sWWwaJTY2PB +5hN51XpED13hpVg44JEXolrlAjW+LdeU764b/BRytrKzdEWkZgIzRMwSSV2I4ioF +qR3ovlLWpVYsyf7ryZbBHy8DqpsYy0un8Kj3q/0C8jpVycK5YwseR8+aHdo9wV7t +LndyQqI/cFr/TiXOCpA06xA+IZnkRwCjm3Qbsau3M2TryHpGBmVus9oXiWRwR/3D +WvNMOa91Is82LrEl3rOfwUMsCXNOslL+KqjcbNXVjtFID8ZEGJIHI8kHlUyW+yb7 +2ftHegmDaXbGyw4Aib7MuKHXacJf2lcgyzuM7LLbW1trDE/ZkSl3ssauXH2+ehKV +BeLcv4Bowl2DdybTeGWlmHcn8UPOusQ0mfMrik6LvOpMa3TTd1KEQrVrcDXvWGmn +USavp31f7KAEnQNKbJym12utL4ko4lU07VDNP6R13wdFXWmLm1NfOWHO0uk+2Msz +Arg+a1hg4GyFCfjcHDMegQ90+gMYJhGzVkzYmnFjdnvd61nRGxQv+woTReKDdgqi +3ZI0T13ksAvHm0ngXx6EZfLblfOqK6nrr1oDp1SZc2+i56Y2PeSSEnIzIWe6Hfm8 +nRj+aK/n0M0XYeFdIJx5xto22XtN1ZumPry2v602I9tzwJjCFBA34zG4p9JQsSpK +ARDR2Eap9Prjd0sUlOvGADQ0vw== +=VIgk +-END PGP SIGNATURE- Added: dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-binaries-1-24aefa9.zip.sha512 == --- dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-binaries-1-24aefa9.zip.sha512 (added) +++ dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-binaries-1-24aefa9.zip.sha512 Tue Oct 10 18:27:58 2023 @@ -0,0 +1 @@ +429b5ada5be9bf02b6aaa3da94880296c4052e036e805c64d114ac3bbe47f057a1b19251904ec1fefc3c21a24b8dbf553bbc9813fe717b9f4c94caf2c585e7e5 nativeexecution-external-binaries-1-24aefa9.zip Added: dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-sources-1-24aefa9.zip == Binary file - no diff available. Propchange: dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-sources-1-24aefa9.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-sources-1-24aefa9.zip.asc == --- dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-sources-1-24aefa9.zip.asc (added) +++ dev/netbeans/native/netbeans-nativeexecution/1-r24aefa9/nativeexecution-external-sources-1-24aefa9
svn commit: r64461 - /release/netbeans/KEYS
Author: matthiasblaesing Date: Tue Oct 10 18:17:28 2023 New Revision: 64461 Log: Add gpg key for matthiasblaes...@apache.org Modified: release/netbeans/KEYS Modified: release/netbeans/KEYS == --- release/netbeans/KEYS (original) +++ release/netbeans/KEYS Tue Oct 10 18:17:28 2023 @@ -970,3 +970,62 @@ IzE9jLb+l2OjaAETtiRuWHov9W7gcKVRm2hX1JHB y2Y63RBJLdyUGQGUFSqA4MqO4Vbb/Ik= =VJ7k -END PGP PUBLIC KEY BLOCK- +pub rsa4096 2023-10-08 [SC] + EE95C317427436B9EC301A29A04A3DA3BED29036 +uid[uneingeschränkt] Matthias Bläsing (CODE SIGNING KEY) +sig 3A04A3DA3BED29036 2023-10-08 Matthias Bläsing (CODE SIGNING KEY) +sub rsa4096 2023-10-08 [E] +sig A04A3DA3BED29036 2023-10-08 Matthias Bläsing (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBGUitUsBEADDwpRN1lO/YP92o/0Vkp8IPLQE70S2v2NF/XdBIpaxhv/PHRJ6 +5488lrGmvnNcxuDGTCeWqgeJclUw99Bn9NWMH7Pid17BvgZmuIYETFPE5JM1ZQxJ +h+bQEAgNlfdF/qLak/vDO2a32601OwK28R2vGaZojuw5jy4QU29DTCHk3+XmMMbm +tvDN4h7gN8nAIUDcc9kR7X5PMuYPg4oXKjj0GOkg2465fbjwzmYItcKDKeoWNQBB +G5US4ju7kPtV+/r/vKY8/yNKMAmmRb76HpFwPCasXtekCnb++KxzFElc3oUfducR +HLfSvRRxlyh1FzB5/b5jla4AARwlFOtKItSNr4+Vk2pTYKLdF4YWWNBtpruE7nFo +jEe8VOaso/MbuUcnqsQaeQCgUwhctcHTynkZYumTg7jjdDpnnzFbk3UITK3gWk4g +b4M44qJukUAt6guCrQhgS6uSjPubvaf47cwQXK52YfUHLUUGkG0/cJ8l10vqEAqs +bQ/KEExjr5T7MS4gwki9VvqqxjHD2NuolxJkOz/O/IFKWwFbEQEzi8xSWUBvzG1i +HOb4f5aFOl+Nn4g4v5QYf+z0pLhZv9kAiugI0OXLvJOV2PtVrFuPTO8/SD+YUAtQ +bekqhVXrG8iWYZNm4C4omXcr9Z0Hwf+CPPNZXm21LKzNzbALYpEKSoaWuQARAQAB +tEJNYXR0aGlhcyBCbMOkc2luZyAoQ09ERSBTSUdOSU5HIEtFWSkgPG1hdHRoaWFz +YmxhZXNpbmdAYXBhY2hlLm9yZz6JAk4EEwEKADgWIQTulcMXQnQ2uewwGimgSj2j +vtKQNgUCZSK1SwIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCgSj2jvtKQ +NmfuD/94TjGazk10gtV4gcqdUTvzkjF3+EZdx2uF9JQRptEHuhrYVYM1qwqAe04S +3h5s96JWHyNPpQGOq4TpvWmaMLV+ok2mhEvChui6NHqWi1cQz0HdDkMct3zuaF3o +iwqCdvz7SP6YxQXpIjQo+09O0mn2hbhhJxTyKLmoL3955RrnYaDUypspC9pAlCGp +AZdOc1XIkyvGJMbJeD21BW4Vxv0xTb0H+jAbozomc22nM/j0RwM9ND6gnOONlicD +MXX+eUilGTGlkosAnmswMxgPhUV1W2eqOoihpmzUIAiAESNVcdB9jLFeJpeni83s +FlZHgYk3YV++HK1vdJvNyZmY9H8a13UBp4L3Cl9w49v0pkfg+UsO/5sk1FuEsI5R +qEpgKLCsrLAlOeL4wO18V6yFlM/CRfvGWwZCEwywn6PEZPLD22BQDkbgJX56E7lY +KDErFDb7bl+tg8LDlXYgYgQ+P36oimsU9crMDrMrig3qzEOGJTWVHmDlf/yMpYlJ ++fmYhV8lo4GO0TtSs7ILL+VHvlNWkq7JoYOBYPyjaZVz5JDvZXGHv/j2hGXhC1BH +W8HG4Qpo+KmmdkI2XVnJf8gchYpKog6xWIDOFMHB6HtSIPUIFCr7pSE1IdiR73hm +71Z8wVtAMLdzEFGU0fUcHjOv/F2WbJAfaQiE25hs9iuLY97WpbkCDQRlIrVLARAA +1bgWgsC8DP+oXzq+cHEkxQ3j6gjTwVbqDV2uMBbf69/YPTnI9tBwebrxz/a8mDwJ +AYcScRL6SyVfoo32yGTBHOT6uzAGEp0zt8TJChEZnzYlKSb6cMh44Ow2yjjQlOjw +enObxIPLe6I2euo7uo4n8JSqu8P8r1eGO8u8uJa+P4pbtS4MmqgeqfjwiPkZfsFz +0iNxlULDoPHH0a++wJM4DU2QMi0VwZb1IcLHrDDrK1BXmc+vnVLmdUsFYO2RCl47 +NvPcxml678THzzFsNR0KgdsZcKFanz+LdwF8YNd1EIVX5mLc2vSaMuLJqVUJCfXL +KXhXFl2U5s9G9VWveD4P7JEnKs5cCZ/6mkZIfGtp8zhuN5N+3bWHdcfFvnlksMmS +GCWeGh2zLBasS5bmpxpnMlnGwoUY20v4L8xxTMPXKFO3hpeCfEK3XOYb1VMGrb1c +l5fmup6YUP3dCAawKhvj60kpdcrM+WUGPtRwkgrX/l1KyneShbn2gxON+o0ShHHI +EzX8Ucv1PWGDvy0I/KhfkPkN9CmY8Wbkt49CAp+nngLgHVacvwiRhIUQwtuxtziO +jDdnSenmiCiW9v+j+EhOXn8DU0xmtJDdmLdk+PsamKwA0zH73LGcOR6U+8bE/qme +Z61Da1WjCESoQ4FCExb1f1S9ro4WBsn9aUkgYbzhsQUAEQEAAYkCNgQYAQoAIBYh +BO6VwxdCdDa57DAaKaBKPaO+0pA2BQJlIrVLAhsMAAoJEKBKPaO+0pA2mgIP/28y +OUEnfL5h1wi3Fia48rBHI+ghMENch4P2Fr99Fhkyh1YoZgTWK9nmQHrPC/staaiv +2yI06bHxE8MaiEdJ+D8JBM1jMFQvf2xKjq/dOOzYtKYihO8HdeP8RXJ58BFwBPTh +CvSwc07Tpqhuq055ELYELiVBToUdKh1YDLp7DJL8/E8enAgM8/GZWyj8ZXbv2Un3 +sqcgZrVCN0Ls75eeFVQ5nHTtGqF1zuHVdTG1TUPLm4MCSY/xHJkQpHRsqWk96sr2 +Ns8T8ENqTvgkhgHQscMdJUKjW63a2wkzarqyPRRsQHyZjP/WaIsLmCFWz+5k20Rh +Ia+YbuUUXQvpwQxyMCB52WFq5nPgUfIsxX2kPnla/PnjllU5shNMz+eKL3a8gPpJ +REXmjL9Ix1cX+eXdX1u0nDqjX9k4F0qk+ouQVPpIf5CEit1CnJP5KFu0VMLc/s5w +dJlSE6aiKnT/NiXqbq/FUxCY+FGFAxk617SPozHGiVhvqfH3AXyxnnflufBjyVx8 +BaCAejkMykT31ix2DQMRtYCA7oj3rO87UZFeORWpfi2o7mvDej7mqRoh6n7qCpP+ +ZR1GbCMxjNKLV010KNPWuRm5fEl4tMevavvwHnWUjjUAZZ3+k+GhSmJ4pUp+ZQJw +ywjKufWHWXmpCw+C92XVIMYVwnqEQD8hfZFoXm+z +=2uRS +-END PGP PUBLIC KEY BLOCK- - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated (7a21a21694 -> 24aefa99e4)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 7a21a21694 Merge pull request #6512 from troizet/php_code_completion_settings_checkboxes new 3d43c78eef native profiler: Copy LICENSE and NOTICE file to binary library and create required directories at build time new a00b624429 native dlight.nativeexecution: Copy LICENSE and NOTICE file to binary library new 24aefa99e4 Merge pull request #6539 from matthiasblaesing/native-with-license The 9139 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/native-binary-build-dlight.nativeexecution.yml | 2 ++ .github/workflows/native-binary-build-lib.profiler.yml | 3 ++- profiler/lib.profiler/native/scripts/buildnative-linux.sh| 3 +++ profiler/lib.profiler/native/scripts/buildnative-linux64.sh | 3 +++ profiler/lib.profiler/native/scripts/buildnative-mac.sh | 2 ++ 5 files changed, 12 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 (b216120152 -> f6e7fe3c0d)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from b216120152 Merge pull request #6451 from matthiasblaesing/css_ext new cb180eced8 JakartaEE Persistence/JSF/Servlet: Fix/improve unittests new 93489d5a1d JakartaEE Persistence/JSF/Servlet: Add (partitial) support for jakarta package namespace new 9bcf584a88 Add @todos for JakartaEE migration new f6e7fe3c0d Merge pull request #6473 from matthiasblaesing/jsf The 9105 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: .../common/annotation/CommonAnnotationHelper.java | 53 +- .../dd/impl/common/annotation/EjbRefHelper.java| 55 +- .../dd/impl/common/annotation/ResourceImpl.java| 31 +- .../dd/impl/common/annotation/ServiceRefImpl.java | 6 +- .../impl/ejb/annotation/EnterpriseBeansImpl.java | 33 +- .../dd/impl/ejb/annotation/MessageDrivenImpl.java | 9 +- .../j2ee/dd/impl/ejb/annotation/SessionImpl.java | 35 +- .../dd/impl/web/annotation/AnnotationHelpers.java | 31 +- .../j2ee/dd/impl/web/annotation/SecurityRoles.java | 5 +- .../j2ee/dd/impl/web/annotation/WebFilter.java | 5 +- .../j2ee/dd/impl/web/annotation/WebServlet.java| 5 +- .../annotation/CommonAnnotationHelperTest.java | 4 +- .../dd/impl/ejb/annotation/SessionImplTest.java| 7 +- .../j2ee/ejbcore/action/SendJMSGenerator.java | 150 +++-- .../ejb/wizard/mdb/MdbPropertiesPanelVisual.java | 2 - .../wizard/mdb/MessageDestinationUiSupport.java| 9 +- .../testGenerateJavaEE14/TestBmp.java | 5 +- .../testGenerateJavaEE14/TestBmpLocal.java | 5 +- .../testGenerateJavaEE14/TestBmpLocalHome.java | 5 +- .../testGenerateJavaEE14/TestCmp.java | 5 +- .../testGenerateJavaEE14/TestCmpLocal.java | 5 +- .../testGenerateJavaEE14/TestCmpLocalHome.java | 5 +- .../testGenerateJavaEE14/TestCmpRemote.java| 5 +- .../testGenerateJavaEE14/TestCmpRemoteHome.java| 5 +- .../testGenerateJavaEE14/TestMDBQueueBean.java | 5 +- .../testGenerateJavaEE14/TestMDBTopicBean.java | 5 +- .../testGenerateJavaEE50/TestMDBQueueBean.java | 5 +- .../testGenerateJavaEE50/TestMDBTopicBean.java | 14 +- .../testGenerateJavaEE70/TestMDBQueueBean.java | 9 +- .../testGenerateJavaEE70/TestMDBQueueBean2.java| 9 +- .../testGenerateJavaEE70/TestMDBTopicBean.java | 11 +- .../testGenerateJavaEE14/TestStatefulLR.java | 5 +- .../testGenerateJavaEE14/TestStatefulLRLocal.java | 5 +- .../TestStatefulLRLocalHome.java | 5 +- .../testGenerateJavaEE14/TestStatelessLR.java | 5 +- .../testGenerateJavaEE14/TestStatelessLRLocal.java | 5 +- .../TestStatelessLRLocalHome.java | 5 +- .../TestStatelessLRRemote.java | 5 +- .../TestStatelessLRRemoteHome.java | 5 +- .../testGenerateJavaEE50/TestStateful.java | 5 +- .../testGenerateJavaEE50/TestStatefulRemote.java | 5 +- .../testGenerateJavaEE50/TestStateless.java| 5 +- .../testGenerateJavaEE50/TestStatelessLocal.java | 5 +- .../testGenerateJavaEE50/TestStatelessRemote.java | 5 +- .../testGenerateJavaEE60/TestSingleton.java| 5 +- .../testGenerateJavaEE60/TestStateful.java | 5 +- .../testGenerateJavaEE60/TestStatefulRemote.java | 5 +- .../testGenerateJavaEE60/TestStateless.java| 5 +- .../testGenerateJavaEE60/TestStatelessLocal.java | 5 +- .../testGenerateJavaEE60/TestStatelessRemote.java | 5 +- .../api/codegeneration/CallEjbGeneratorTest.java | 4 +- .../api/codegeneration/MessageGeneratorTest.java | 8 +- .../jpa/dao/EjbFacadeWizardIteratorTest.java | 5 +- .../j2ee/ejbverification/EJBAPIAnnotations.java| 1 + .../rules/AnnotationPostContruct.java | 1 + .../resources/api/JndiResourcesDefinition.java | 2 + .../resources/impl/model/JmsDestinationImpl.java | 5 +- .../resources/impl/model/JmsDestinationsImpl.java | 17 +- .../impl/model/JndiResourcesObjectProviders.java | 34 +- .../web/beans/actions/InterceptorFactory.java | 1 + .../web/beans/actions/InterceptorGenerator.java| 1 + .../beans/analysis/analyzer/AnnotationUtil.java| 1 + .../analyzer/type/ManagedBeansAnalizer.java| 1 + .../modules/web/beans/hints/CreateQualifier.java | 1 + .../beans/impl/model/AnnotationObjectProvider.java | 1 + .../modules/web/beans/impl/model/BeansFilter.java | 1 + .../web/beans/impl/model/EnableBeansFilter.java| 1 + .../beans/impl/model/EventInjectionPointLogic.java | 1 +
[netbeans] branch master updated (8dc5e34e43 -> b216120152)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 8dc5e34e43 Merge pull request #6309 from pepness/fix-mem-leak new 17e39e0003 CSS: Add @layer parsing capabilities to the CSS parser new 30bc1b3fc6 CSS: Enable function-style @supports queries new 8cff7234b7 CSS: Containment Module Level 3 new c5c4bb5bae CSS: Improve mapping of text module (prepared for level 4) new 1e8b2d638f CSS: Update css3-spec new 3bcece4ec3 CSS: Map CSS math functions (min, max, sin, cos, ...) new e279788148 LESS: Enable parsing of "optional" imports (@import (optional) "user.less";) new b216120152 Merge pull request #6451 from matthiasblaesing/css_ext The 9101 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: ide/css.editor/external/binaries-list | 2 +- ide/css.editor/external/css3-spec-howtocreate.txt | 5 +- .../css/editor/module/main/Bundle.properties | 1 + .../editor/module/main/DefaultCssEditorModule.java | 3 +- .../module/main/properties/contain.properties | 9 +- .../main/properties/default_module.properties |62 +- .../module/main/properties/sizing.properties | 4 +- .../editor/module/main/properties/text.properties |67 +- .../main/BackgroundsAndBordersModuleTest.java | 6 +- .../editor/module/main/DefaultCssModuleTest.java |28 +- .../module/main/properties/PropertiesATest.java|10 + .../src/org/netbeans/modules/css/lib/Css3.g| 178 +- .../org/netbeans/modules/css/lib/Css3Lexer.java| 7201 ++-- .../org/netbeans/modules/css/lib/Css3Parser.java | 41100 +++ .../netbeans/modules/css/lib/api/CssTokenId.java | 6 +- .../org/netbeans/modules/css/lib/api/NodeType.java |29 + .../css/lib/api/properties/PropertyCategory.java | 1 + .../modules/css/lib/Css3ParserLessTest.java|27 + .../modules/css/lib/Css3ParserScssTest.java|22 + .../netbeans/modules/css/lib/Css3ParserTest.java |51 +- .../properties/GrammarResolverListenerTest.java| 6 +- .../css/lib/api/properties/PropertyValueTest.java |55 +- 22 files changed, 27631 insertions(+), 21242 deletions(-) copy enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/ddloaders/multiview/tables/Bundle.properties => ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/contain.properties (82%) - 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: Autoupdate system must check org.openide.modules.arch as org.openide.modules.os is already handled
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 e46b0ea5e8 Autoupdate system must check org.openide.modules.arch as
org.openide.modules.os is already handled
new 0216ca48bb Merge pull request #6477 from
matthiasblaesing/plugin_manager_architecture_dependency
e46b0ea5e8 is described below
commit e46b0ea5e8a8075bfd8caa47cd93a3f5e91e54ed
Author: Matthias Bläsing
AuthorDate: Thu Sep 21 19:34:23 2023 +0200
Autoupdate system must check org.openide.modules.arch as
org.openide.modules.os is already handled
With d1300be50b8864eb605cee456c4b123d768e0eca the netbeans module system
was enhanced to enable modules to be filtered by architecture. Missing
from that commit was adjustment to the autoupdate system, which also
needs to consider the architecture when providing packages for
selection.
Closes: #6460
---
.../modules/autoupdate/services/UpdateUnitFactory.java | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git
a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/UpdateUnitFactory.java
b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/UpdateUnitFactory.java
index 0b6a0a77f5..361f0cfd20 100644
---
a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/UpdateUnitFactory.java
+++
b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/UpdateUnitFactory.java
@@ -217,13 +217,14 @@ public class UpdateUnitFactory {
// XXX: it's should be moved in UI what should filter all elements w/
broken dependencies
// #101515: Plugin Manager must filter updates by platform dependency
-boolean passed = false;
UpdateElementImpl elImpl = Trampoline.API.impl (element);
if (elImpl instanceof ModuleUpdateElementImpl && elImpl.getModuleInfos
() != null && elImpl.getModuleInfos ().size() == 1) {
for (Dependency d : elImpl.getModuleInfos ().get
(0).getDependencies ()) {
if (Dependency.TYPE_REQUIRES == d.getType ()) {
//log.log (Level.FINEST, "Dependency: NAME: " + d.getName
() + ", TYPE: " + d.getType () + ": " + d.toString ());
if (d.getName ().startsWith ("org.openide.modules.os")) {
// NOI18N
+// Filter OS specific dependencies
+boolean passed = false;
for (ModuleInfo info :
InstalledModuleProvider.getInstalledModules ().values ()) {
if (Arrays.asList (info.getProvides ()).contains
(d.getName ())) {
log.log (Level.FINEST, element + " which
requires OS " + d + " succeed.");
@@ -235,6 +236,20 @@ public class UpdateUnitFactory {
log.log (Level.FINE, element + " which requires OS
" + d + " fails.");
return ;
}
+} else if (d.getName ().startsWith
("org.openide.modules.arch")) { // NOI18N
+// Filter architecture specific dependencies
+boolean passed = false;
+for (ModuleInfo info :
InstalledModuleProvider.getInstalledModules ().values ()) {
+if (Arrays.asList (info.getProvides ()).contains
(d.getName ())) {
+log.log (Level.FINEST, element + " which
requires architecture " + d + " succeed.");
+passed = true;
+break;
+}
+}
+if (! passed) {
+log.log (Level.FINE, element + " which requires
architecture " + d + " fails.");
+return ;
+}
}
}
}
-
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 (fbdda86a51 -> 3c33616c3a)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from fbdda86a51 Work on HCL Expression AST new 1b01c99f68 Retry fetching clipboard contents when it initially fails new 0e226f2131 Cleanup warnings/refactoring hints in NbClipboard new 3c33616c3a Merge pull request #6443 from matthiasblaesing/clipboard2 The 9069 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/NbClipboard.java | 133 + 1 file changed, 82 insertions(+), 51 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: CPPLITE: Ensure STDERR of language server is discarded and not ignored
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 c5f87ba819 CPPLITE: Ensure STDERR of language server is discarded and
not ignored
new 5014c7eb74 Merge pull request #6305 from matthiasblaesing/cpplite2
c5f87ba819 is described below
commit c5f87ba81950ee30551af5a982f3849405715ac0
Author: Matthias Bläsing
AuthorDate: Sat Aug 5 21:08:04 2023 +0200
CPPLITE: Ensure STDERR of language server is discarded and not ignored
The language server ccls and clangd both output debugging information
to STDERR. This works while the output buffer of the language server
is not yet filled and fails when the buffer is full.
Closes: #6297
---
cpplite/cpplite.editor/nbproject/project.properties| 3 ++-
.../org/netbeans/modules/cpplite/editor/lsp/LanguageServerImpl.java| 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/cpplite/cpplite.editor/nbproject/project.properties
b/cpplite/cpplite.editor/nbproject/project.properties
index 5137752915..88e39a3d0f 100644
--- a/cpplite/cpplite.editor/nbproject/project.properties
+++ b/cpplite/cpplite.editor/nbproject/project.properties
@@ -15,5 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-javac.source=1.8
+javac.source=11
+javac.target=11
javac.compilerargs=-Xlint -Xlint:-serial
diff --git
a/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/lsp/LanguageServerImpl.java
b/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/lsp/LanguageServerImpl.java
index 06f4dc5189..5cb27cefbf 100644
---
a/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/lsp/LanguageServerImpl.java
+++
b/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/lsp/LanguageServerImpl.java
@@ -124,6 +124,8 @@ public class LanguageServerImpl implements
LanguageServerProvider {
ProcessBuilder builder = new ProcessBuilder(command);
if (LOG.isLoggable(Level.FINEST)) {
builder.redirectError(Redirect.INHERIT);
+} else {
+builder.redirectError(Redirect.DISCARD);
}
Process process = builder.start();
InputStream in = process.getInputStream();
-
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: Fix: Enable to add docker instance via socket on mac with apple silicon
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 17e30bac34 Fix: Enable to add docker instance via socket on mac with
apple silicon
new faef73873a Merge pull request #6328 from lazydan/fix-add-socket-docker
17e30bac34 is described below
commit 17e30bac34ea18d257754fa63b448749b977c430
Author: Chen Dan
AuthorDate: Fri Aug 11 15:19:37 2023 +0800
Fix: Enable to add docker instance via socket on mac with apple silicon
Use AFUNIXSocket.isSupported() to check the socket support
---
.../src/org/netbeans/modules/docker/api/DockerSupport.java | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git
a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java
b/ide/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java
index 1cfb8074d1..0290397d22 100644
--- a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java
+++ b/ide/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java
@@ -30,7 +30,7 @@ import java.util.prefs.NodeChangeListener;
import java.util.prefs.Preferences;
import javax.swing.event.ChangeListener;
import org.netbeans.api.annotations.common.NonNull;
-import org.openide.util.BaseUtilities;
+import org.newsclub.net.unix.AFUNIXSocket;
import org.openide.util.ChangeSupport;
import org.openide.util.NbPreferences;
import org.openide.util.Parameters;
@@ -128,12 +128,7 @@ public final class DockerSupport {
}
public boolean isSocketSupported() {
-if (BaseUtilities.getOperatingSystem() != BaseUtilities.OS_LINUX
-&& BaseUtilities.getOperatingSystem() != BaseUtilities.OS_MAC)
{
-return false;
-}
-String arch = System.getProperty("os.arch"); // NOI18N
-return arch != null && (arch.contains("x86") ||
arch.contains("amd64")); // NOI18N
+return AFUNIXSocket.isSupported();
}
private boolean isInitialized() {
-
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: Fix: Java completion parameter tooltip is not shown if previous parameter is type variable
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 5b55a370fb Fix: Java completion parameter tooltip is not shown if
previous parameter is type variable
new 1a29d61d4c Merge pull request #6268 from
matthiasblaesing/parameter_tooltip
5b55a370fb is described below
commit 5b55a370fb1c2dc79c9af614e0c7a2629f182b86
Author: Matthias Bläsing
AuthorDate: Fri Jul 28 22:46:41 2023 +0200
Fix: Java completion parameter tooltip is not shown if previous parameter
is type variable
Testsetup:
public class TestParamResolution {
public static void main(String[] args) {
List.of("Hallo", "World");
testMethod("Hello", "World", "Test");
testMethod(1, "Hello", "World");
}
public static & Serializable>
void testMethod(S genericParam, String dummy1_1, String dummy1_2) {}
public static void testMethod(S genericParam,
String dummy2_1, String dummy2_2) {}
public static void
testArgumentTypeVariableParameter(T genericParam, List x) {
testMethod(genericParam, "x", "dfd");
}
}
Inside main the problem can be demonstrated with all demonstrated
calls. When the caret is placed in the first argument (before first
comma), the parameter popup (CTRL+P) can be opened for all case. If the
caret is placed in the second argument (after first comma), it does not
work anymore.
Investigation shows that javax.lang.model.util.Types#isAssignable
returns false if the target type is a TypeVariable. To fix this the
upper bound of the TypeMirror is unwrapped and the check is repeated.
This also works if the argument is a TypeVariable itself.
With this fix applied all places (main and
testArgumentTypeVariableParameter) allow to invoke the parameter popup.
---
.../netbeans/modules/java/completion/JavaTooltipTask.java| 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git
a/java/java.completion/src/org/netbeans/modules/java/completion/JavaTooltipTask.java
b/java/java.completion/src/org/netbeans/modules/java/completion/JavaTooltipTask.java
index 81a9308ced..10149c3d09 100644
---
a/java/java.completion/src/org/netbeans/modules/java/completion/JavaTooltipTask.java
+++
b/java/java.completion/src/org/netbeans/modules/java/completion/JavaTooltipTask.java
@@ -275,7 +275,7 @@ public final class JavaTooltipTask extends BaseTask {
ret.add(paramStrings);
break;
}
-if (argTypes[i] == null || argTypes[i].getKind() !=
TypeKind.ERROR && !types.isAssignable(argTypes[i], param)) {
+if (argTypes[i] == null || argTypes[i].getKind() !=
TypeKind.ERROR && !isAssignable(types, argTypes[i], param)) {
break;
}
}
@@ -284,4 +284,14 @@ public final class JavaTooltipTask extends BaseTask {
}
return ret.isEmpty() ? null : ret;
}
+
+private static boolean isAssignable(Types types, TypeMirror arg,
TypeMirror parameter) {
+if(types.isAssignable(arg, parameter)) {
+return true;
+} else if (parameter instanceof TypeVariable) {
+TypeMirror requiredTypes = ((TypeVariable)
parameter).getUpperBound();
+return types.isAssignable(arg, requiredTypes);
+}
+return false;
+}
}
-
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 (4e6930488c -> 256f1b32dd)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 4e6930488c Merge pull request #6249 from matthiasblaesing/js_fixes
new 9e926b4a33 NetBeans UserCatalog should allow mapping namespace to
local file
new 2874cea502 Fix parameter names in signature of
CatalogEntityResolver.resolve and cleanup
new 952d9fc22a Allow schema based completion in XML files where namespace
is registered in UserCatalog
new b85bb0d41a Reenable test
SecureURLResourceRetrieverTest.shouldUseKeyStoreFromSystemProperties()
new 256f1b32dd Merge pull request #6245 from
matthiasblaesing/xml_validation
The 8943 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:
ide/api.xml.ui/nbproject/project.xml | 19 ++
.../netbeans/spi/xml/cookies/SharedXMLSupport.java | 264 -
.../spi/xml/cookies/SharedXMLSupportTest.java | 71 +-
...onformingNamespacesDocumentWithKnownSchema.xml} | 1 -
.../netbeans/modules/xml/catalog/Bundle.properties | 2 +-
.../modules/xml/catalog/CatalogEntryPanel.form | 7 +-
.../modules/xml/catalog/CatalogEntryPanel.java | 8 +-
.../modules/xml/catalog/CatalogEntityResolver.java | 79 +++---
.../impl/SecureURLResourceRetrieverTest.java | 2 -
.../xml/retriever/impl/badssl.com-client.p12 | Bin 2797 -> 2789 bytes
.../completion/util/CompletionContextImpl.java | 254 ++--
11 files changed, 421 insertions(+), 286 deletions(-)
copy
ide/api.xml.ui/test/unit/src/org/netbeans/spi/xml/cookies/data/{ConformingNamespacesDocument.xml
=> ConformingNamespacesDocumentWithKnownSchema.xml} (95%)
-
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: Fix handling of classes declared in anonymous functions
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 5f33fe47b1 Fix handling of classes declared in anonymous functions
new 4e6930488c Merge pull request #6249 from matthiasblaesing/js_fixes
5f33fe47b1 is described below
commit 5f33fe47b1e127eefaf86dcc2aa96d3a2b644096
Author: Matthias Bläsing
AuthorDate: Sun Jul 23 20:46:52 2023 +0200
Fix handling of classes declared in anonymous functions
Consider this construct:
(function () {
class Directory {
constructor(displayName) {
this.displayName = displayName;
}
}
class ImageFile{
constructor(displayName){
this.displayName = displayName;
}
}
})();
Before this change this construct was not correctly parsed and the
constructor was not cleanly recognised, leading to missing usage
marks (i.e. the displayName above was marked as unused).
A different fallout of that problem is visible with this:
(function () {
class Directory {
constructor(displayName) {
this.displayName = displayName;
}
}
class ImageFile{
constructor(displayName){
this.displayName = displayName;
}
}
function getJsonData(folderURL) {
const body = folderURL;
}
})();
Problems:
- constructor from ImageFile is shown as a toplevel function
- ImageFile is listed without its constructor and without its
displayName property
---
.../structure/classInAnonymousFunction.js | 33 +++
.../classInAnonymousFunction.js.structure | 6
.../structure/classInAnonymousFunction2.js | 36 +
.../classInAnonymousFunction2.js.structure | 7
.../javascript2/editor/JsStructureScannerTest.java | 8 +
.../modules/javascript2/model/ModelVisitor.java| 21 +---
.../testfiles/model/classInAnonymousFunction.js| 33 +++
.../model/classInAnonymousFunction.js.model| 29 +
.../testfiles/model/classInAnonymousFunction2.js | 36 +
.../model/classInAnonymousFunction2.js.model | 37 ++
.../modules/javascript2/model/ModelTest.java | 8 +
11 files changed, 249 insertions(+), 5 deletions(-)
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/structure/classInAnonymousFunction.js
b/webcommon/javascript2.editor/test/unit/data/testfiles/structure/classInAnonymousFunction.js
new file mode 100644
index 00..2d05a5fb09
--- /dev/null
+++
b/webcommon/javascript2.editor/test/unit/data/testfiles/structure/classInAnonymousFunction.js
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+(function () {
+
+class Directory {
+constructor(displayName) {
+this.displayName = displayName;
+}
+}
+
+class ImageFile{
+constructor(displayName){
+this.displayName = displayName;
+}
+}
+})();
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/structure/classInAnonymousFunction.js.structure
b/webcommon/javascript2.editor/test/unit/data/testfiles/structure/classInAnonymousFunction.js.structure
new file mode 100644
index 00..0ab97d2a39
--- /dev/null
+++
b/webcommon/javascript2.editor/test/unit/data/testfiles/structure/classInAnonymousFunction.js.structure
@@ -0,0 +1,6 @@
+Directory:CLASS:[PUBLIC]:ESCAPED{Directory}:
+
constructor:CONSTRUCTOR:[PUBLIC]:ESCAPED{constructor}ESCAPED{(}ESCAPED{displayName}ESCAPED{)}ESCAPED{ : }Directory:
+ displayName:FIELD:[PUBLIC]:ESCAPED{displayName}:
+ImageFile:CLASS:[PUBLIC]:ESCAPED{ImageFile}:
+
constructor:CONSTRUCTOR:[PUBLIC]:ESCAPED{constructor}ESCAPED{(}ESCAPED{displayName}ESCAPED{)}E
[netbeans] branch master updated: Added ability for Jakarta EE projects to: * Create entities from database tables * Create message driven, stateful, stateless and session beans
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing 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 dabf55f848 Added ability for Jakarta EE projects to: * Create entities from database tables * Create message driven, stateful, stateless and session beans new 0bee9d3691 Merge pull request #6129 from asbachb/jakarta-namespace-entity-sessionbeans dabf55f848 is described below commit dabf55f848ceccb42bbf0afb6fbcd5f30d7f08eb Author: Benjamin Asbach AuthorDate: Tue Jun 20 16:18:10 2023 +0800 Added ability for Jakarta EE projects to: * Create entities from database tables * Create message driven, stateful, stateless and session beans This should fix #4827 #4828 --- enterprise/j2ee.ejbcore/licenseinfo.xml| 6 ++ .../org-netbeans-modules-j2ee-ejbcore.sig | 13 ++-- .../api/codegeneration/SessionGenerator.java | 71 +- .../wizard/jpa/dao/AppServerValidationPanel.java | 16 +++-- .../ejb/wizard/session/SessionEJBWizard.java | 10 +-- .../modules/j2ee/ejbcore/resources/layer.xml | 47 ++ .../templates/EJB40MessageDrivenBean.template | 31 ++ .../resources/templates/EJB40SessionLocal.template | 20 ++ .../templates/EJB40SessionRemote.template | 20 ++ .../templates/EJB40SingletonEjbClass.template | 39 .../templates/EJB40StatefulEjbClass.template | 28 + .../templates/EJB40StatelessEjbClass.template | 39 .../api/codegeneration/SessionGeneratorTest.java | 15 ++--- .../PersistenceClientEntitySelectionVisual.java| 2 +- .../persistence/wizard/entity/EntityWizard.java| 25 +--- .../wizard/fromdb/JavaPersistenceGenerator.java| 65 .../wizard/entity/EntityWizardTest.java| 4 +- 17 files changed, 371 insertions(+), 80 deletions(-) diff --git a/enterprise/j2ee.ejbcore/licenseinfo.xml b/enterprise/j2ee.ejbcore/licenseinfo.xml index f7b02f913a..4332fbe249 100644 --- a/enterprise/j2ee.ejbcore/licenseinfo.xml +++ b/enterprise/j2ee.ejbcore/licenseinfo.xml @@ -46,6 +46,12 @@ src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatefulEjbClass.template src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatelessEjbClass.template src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB31SingletonEjbClass.template + src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB40StatelessEjbClass.template + src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB40StatefulEjbClass.template + src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB40SessionLocal.template + src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB40SessionRemote.template + src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB40MessageDrivenBean.template + src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB40SingletonEjbClass.template src/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.template src/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.template diff --git a/enterprise/j2ee.ejbcore/nbproject/org-netbeans-modules-j2ee-ejbcore.sig b/enterprise/j2ee.ejbcore/nbproject/org-netbeans-modules-j2ee-ejbcore.sig index 9a7bd564ac..ad286923b7 100644 --- a/enterprise/j2ee.ejbcore/nbproject/org-netbeans-modules-j2ee-ejbcore.sig +++ b/enterprise/j2ee.ejbcore/nbproject/org-netbeans-modules-j2ee-ejbcore.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 1.71 +#Version 1.72 CLSS public abstract java.awt.Component cons protected init() @@ -656,7 +656,7 @@ supr java.lang.Object hfds key,value CLSS public final org.netbeans.modules.j2ee.ejbcore.api.codegeneration.SessionGenerator -cons protected init(java.lang.String,org.openide.filesystems.FileObject,boolean,boolean,java.lang.String,boolean,boolean,boolean,org.netbeans.modules.j2ee.ejbcore.ejb.wizard.session.TimerOptions,boolean,boolean,boolean) +cons protected init(java.lang.String,org.openide.filesystems.FileObject,boolean,boolean,java.lang.String,org.netbeans.api.j2ee.core.Profile,boolean,boolean,org.netbeans.modules.j2ee.ejbcore.ejb.wizard.session.TimerOptions,boolean,boolean,boolean) fld public final static java.lang.String ANNOTATION_LOCAL_BEAN = "javax.ejb.LocalBean" fld public final static java.lang.String EJB21_EJBCLASS = "Templates/J2EE/EJB21/SessionEjbClass.java" fld public final static java.lang.String EJB21_LOCAL = "Templates/J2EE/EJB21/SessionLocal.java" @@ -668,15 +668,20 @@ fld public final static java.lang.String EJB30_REMOTE = "Templates/J2EE/EJB30/Se fld public final static java.lang.String EJB30_STATEFUL_EJBCLASS = "Templates/J2EE/EJB30/
[netbeans] branch master updated: [NETBEANS-6147] Initial implementation of better long string handling
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 7f2559d13c [NETBEANS-6147] Initial implementation of better long
string handling
new a58c6677a9 Merge pull request #6157 from SirIntellegence/NETBEANS-6147
7f2559d13c is described below
commit 7f2559d13c24beaf4dc55f7acf9ae5805ab23fa3
Author: Austin Stephens
AuthorDate: Wed Jul 5 10:28:11 2023 -0600
[NETBEANS-6147] Initial implementation of better long string handling
Co-authored-by: Matthias Bläsing
---
.../debugger/jpda/models/ShortenedStrings.java | 337 -
1 file changed, 259 insertions(+), 78 deletions(-)
diff --git
a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/ShortenedStrings.java
b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/ShortenedStrings.java
index f2e8892055..85558c6716 100644
---
a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/ShortenedStrings.java
+++
b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/ShortenedStrings.java
@@ -41,6 +41,7 @@ import java.io.IOException;
import java.io.Reader;
import java.lang.ref.Reference;
import java.lang.ref.WeakReference;
+import java.text.MessageFormat;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -49,6 +50,7 @@ import java.util.Set;
import java.util.WeakHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.api.debugger.DebuggerManager;
import org.netbeans.api.debugger.DebuggerManagerAdapter;
import org.netbeans.api.debugger.Session;
@@ -165,8 +167,11 @@ public final class ShortenedStrings {
}
}
-private static void register(String shortedString, StringReference sr, int
length, ArrayReference chars) {
-StringInfo si = new StringInfo(sr, shortedString.length() - 3, length,
chars);
+private static void register(String shortedString, StringReference sr,
+int length, ArrayReference chars, InternalStringEncoding
backingEncoding,
+boolean isLittleEndian) {
+StringInfo si = new StringInfo(sr, shortedString.length() - 3, length,
+chars, backingEncoding, isLittleEndian);
synchronized (infoStrings) {
infoStrings.put(shortedString, si);
}
@@ -204,6 +209,7 @@ public final class ShortenedStrings {
}
String string = null;
boolean isShort = true;
+InternalStringEncoding backingEncoding =
InternalStringEncoding.CHAR_ARRAY;
try {
ReferenceType st = ObjectReferenceWrapper.referenceType(sr);
ArrayReference sa = null;
@@ -262,6 +268,9 @@ public final class ShortenedStrings {
isUTF16 = true;
}
}
+backingEncoding = isUTF16 ?
+InternalStringEncoding.BYTE_ARRAY_UTF16 :
+InternalStringEncoding.BYTE_ARRAY_LATIN1;
}
int limit = AbstractObjectVariable.MAX_STRING_LENGTH;
if (isUTF16){
@@ -288,65 +297,19 @@ public final class ShortenedStrings {
} else {
assert sa != null;
int l = AbstractObjectVariable.MAX_STRING_LENGTH;
-List values = ArrayReferenceWrapper.getValues(sa, 0,
-isUTF16 ? (l * 2) : l);
char[] characters = new char[l + 3];
-if (isCompactImpl) {
-//java compact string
-if (!isUTF16) {
-//we can just cast to char
-for (int i = 0; i < l; i++) {
-Value v = values.get(i);
-if (!(v instanceof ByteValue)) {
-return ERROR_RESULT;
-}
-char c = (char)((ByteValue) v).byteValue();
-//remove the extended sign
-c &= 0xFF;
-characters[i] = c;
-}
-}
-else {
-int hiByteShift;
-int lowByteShift;
-//is it little or big endian?
-if (isLittleEndian(sr.virtualMachine())){
-hiByteShift = 0;
-lowByteShift = 8;
-}
-else{
-hiByteShift = 8;
-lowByteSh
[netbeans] branch master updated: Fix unstable unittest org.netbeans.modules.maven.ModuleInfoSupportTest
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 9121943540 Fix unstable unittest
org.netbeans.modules.maven.ModuleInfoSupportTest
new a872ceb725 Merge pull request #6168 from
matthiasblaesing/maven_module_support_2
9121943540 is described below
commit 91219435407853d1a854c41be491cd731063c3fa
Author: Matthias Bläsing
AuthorDate: Sat Jul 8 22:10:17 2023 +0200
Fix unstable unittest org.netbeans.modules.maven.ModuleInfoSupportTest
25347dfe7f75e540d751f06b541320dc6c5511ce introduces a new unittest,
that proved to be unstable in CI/CD pipeline. The failure can be
reproduced after several tries. Adding
workDir.getFileSystem().refresh(true);
seems to fix the issue. Hypothesis:
The new module files are written outside the filesystem infrastructure
of NetBeans and the cache of the javac integration does not pick up the
module files created by the javac-Tool.
Apart from the fix, style of the code was improved.
---
.../modules/maven/ModuleInfoSupportTest.java | 62 ++
1 file changed, 41 insertions(+), 21 deletions(-)
diff --git
a/java/maven/test/unit/src/org/netbeans/modules/maven/ModuleInfoSupportTest.java
b/java/maven/test/unit/src/org/netbeans/modules/maven/ModuleInfoSupportTest.java
index badb91c19e..aa3d26a93c 100644
---
a/java/maven/test/unit/src/org/netbeans/modules/maven/ModuleInfoSupportTest.java
+++
b/java/maven/test/unit/src/org/netbeans/modules/maven/ModuleInfoSupportTest.java
@@ -21,11 +21,13 @@ package org.netbeans.modules.maven;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import javax.tools.ToolProvider;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.platform.JavaPlatformManager;
import org.netbeans.api.java.source.ClasspathInfo;
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.junit.NbTestCase;
+import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.test.TestFileUtils;
@@ -43,50 +45,68 @@ public class ModuleInfoSupportTest extends NbTestCase {
public void testAddRequires() throws Exception {
System.setProperty("test.load.sync", "true");
-FileObject d = FileUtil.toFileObject(getWorkDir());
-TestFileUtils.writeFile(d, "module-info.java",
-"module Mavenproject {\n}");
-FileObject moduleInfo = d.getFileObject("module-info.java");
+FileObject workDir = FileUtil.toFileObject(getWorkDir());
+FileObject moduleInfo = TestFileUtils.writeFile(
+workDir,
+"module-info.java",
+"module Mavenproject {\n}"
+);
ModuleInfoSupport.addRequires(moduleInfo, List.of("test.dummy"));
assertEquals("module Mavenproject {\nrequires test.dummy;\n}",
moduleInfo.asText());
}
public void testGetDeclaredModules() throws Exception {
System.setProperty("test.load.sync", "true");
-FileObject d = FileUtil.toFileObject(getWorkDir());
-FileObject dummy = d.createFolder("dummy");
-FileObject dummy2 = d.createFolder("dummy2");
-TestFileUtils.writeFile(dummy, "module-info.java", "module test.dummy
{}");
-TestFileUtils.writeFile(dummy2, "module-info.java", "module
test.dummy2x {}");
-TestFileUtils.writeFile(d, "module-info.java",
+FileObject workDir = FileUtil.toFileObject(getWorkDir());
+FileObject dummyDir = workDir.createFolder("dummy");
+FileObject dummy2xDir = workDir.createFolder("dummy2x");
+FileObject dummyModuleInfo = TestFileUtils.writeFile(
+dummyDir,
+"module-info.java",
+"module test.dummy {}"
+);
+FileObject dummy2xModuleInfo = TestFileUtils.writeFile(
+dummy2xDir,
+"module-info.java",
+"module test.dummy2x {}"
+);
+FileObject moduleInfo = TestFileUtils.writeFile(workDir,
"module-info.java",
"module Mavenproject {"
+ "requires test.dummy;\n"
+ "requires test.dummy2x;\n"
+ "\n}");
-FileObject moduleInfo = d.getFileObject("module-info.java");
-javax.tools.ToolProvider.getSystemJavaCompiler().run(
+ToolProvider.getSy
[netbeans] branch master updated (bbc31453ed -> aaf846a189)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from bbc31453ed Merge pull request #6151 from mbien/ci-platform-test-stability new 25347dfe7f Fix wrong javac tree access for module information in modular maven project new ceaeefc864 nb-javac-smokecheck verifies, that NB can be build with nbjavac, not with JDK 8 new aaf846a189 Merge pull request #6154 from matthiasblaesing/maven_module_support The 8770 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 | 4 +- .../netbeans/modules/maven/ModuleInfoSupport.java | 12 +-- .../modules/maven/ModuleInfoSupportTest.java | 97 ++ 3 files changed, 105 insertions(+), 8 deletions(-) create mode 100644 java/maven/test/unit/src/org/netbeans/modules/maven/ModuleInfoSupportTest.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: Getting rid of some console warnings by: * Using generic types to get rid of `unchecked` warnings * Replacing deprecated calls with suggested alternatives
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 62d04cf458 Getting rid of some console warnings by: * Using generic
types to get rid of `unchecked` warnings * Replacing deprecated calls with
suggested alternatives
new 0655f75bd9 Merge pull request #6118 from asbachb/web.core-unchecked
62d04cf458 is described below
commit 62d04cf45810fe32965b72c3ba422daefc95c366
Author: Benjamin Asbach
AuthorDate: Fri Jun 23 22:51:41 2023 +0800
Getting rid of some console warnings by:
* Using generic types to get rid of `unchecked` warnings
* Replacing deprecated calls with suggested alternatives
Minor code improvements:
* Removing unused imports
* Removing unused and commented out code (not touched since years)
* Removed empty if statement and unnecessary double braces
* Adding missing `@Override` annotation
---
.../modules/web/core/api/JspColoringData.java | 14 ++---
.../modules/web/core/jsploader/JspDataObject.java | 72 ++
.../modules/web/core/jsploader/JspNode.java| 32 +-
.../web/core/jsploader/TagLibParseSupport.java | 22 +++
.../web/core/palette/JspPaletteUtilities.java | 45 +++---
.../core/palette/items/GetPropertyCustomizer.form | 7 +++
.../core/palette/items/GetPropertyCustomizer.java | 15 ++---
.../web/core/palette/items/IfCustomizer.form | 7 +++
.../web/core/palette/items/IfCustomizer.java | 6 +-
.../web/core/palette/items/SQLStmtCustomizer.form | 3 +
.../web/core/palette/items/SQLStmtCustomizer.java | 6 +-
.../core/palette/items/SetPropertyCustomizer.form | 7 +++
.../core/palette/items/SetPropertyCustomizer.java | 15 ++---
.../web/core/palette/items/UseBeanCustomizer.form | 5 +-
.../web/core/palette/items/UseBeanCustomizer.java | 6 +-
.../modules/web/jspcompiler/SmapResolver.java | 37 +--
.../netbeans/modules/web/taglib/TLDDataObject.java | 1 -
.../netbeans/modules/web/taglib/TaglibCatalog.java | 1 -
.../netbeans/modules/web/wizards/AttrDialog.form | 9 ++-
.../netbeans/modules/web/wizards/AttrDialog.java | 39 ++--
.../web/wizards/FinishableProxyWizardPanel.java| 8 +++
.../modules/web/wizards/MappingEditor.java | 2 +-
.../modules/web/wizards/TagHandlerIterator.java| 4 +-
.../netbeans/modules/web/wizards/ToolTipCombo.java | 4 +-
.../web/core/TestWebModuleImplementation.java | 2 -
.../WebInjectionTargetQueryImplementationTest.java | 4 +-
.../netbeans/modules/web/core/test/TestUtil.java | 2 +-
27 files changed, 176 insertions(+), 199 deletions(-)
diff --git
a/enterprise/web.core/src/org/netbeans/modules/web/core/api/JspColoringData.java
b/enterprise/web.core/src/org/netbeans/modules/web/core/api/JspColoringData.java
index 81ea6f55cc..150efed28c 100644
---
a/enterprise/web.core/src/org/netbeans/modules/web/core/api/JspColoringData.java
+++
b/enterprise/web.core/src/org/netbeans/modules/web/core/api/JspColoringData.java
@@ -44,7 +44,7 @@ public final class JspColoringData extends
PropertyChangeSupport {
public static final String PROP_PARSING_IN_PROGRESS = "parsingInProgress";
//NOI18N
/** Taglib id -> TagLibraryInfo */
-private Map taglibs;
+private Map taglibs;
/** Prefix -> Taglib id */
private Map prefixMapper;
@@ -120,7 +120,7 @@ public final class JspColoringData extends
PropertyChangeSupport {
* @param newPrefixMapper the new map of (prefix, uri)
* @param parseSuccessful whether parsing was successful. If false, then
the new information is partial only
*/
-public void applyParsedData(Map newTaglibs, Map
newPrefixMapper, boolean newELIgnored, boolean newXMLSyntax, boolean
parseSuccessful) {
+public void applyParsedData(Map newTaglibs,
Map newPrefixMapper, boolean newELIgnored, boolean
newXMLSyntax, boolean parseSuccessful) {
initialized = true;
@@ -165,7 +165,7 @@ public final class JspColoringData extends
PropertyChangeSupport {
String uri = newPrefixMapper.get(prefix);
String uriOld = prefixMapper.get(prefix);
if ((uriOld == null) || !uri.equals(uriOld)) {
-Object newTaglib = newTaglibs.get(uri);
+TagLibraryInfo newTaglib = newTaglibs.get(uri);
if (newTaglib != null) {
// change - merge it
prefixMapper.put(prefix, uri);
@@ -180,8 +180,8 @@ public final class JspColoringData extends
PropertyChangeSupport {
}
}
-private static boolean equalsColoringInformation(Map taglibs1, Map prefixMapper1,
-Map taglibs2, Map prefixMapper2) {
+private static boolean equalsColoringInformat
[netbeans] branch master updated: [NETBEANS-4927] Maven EAR project fails to deploy on an app server (GlassFish)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 59382d6b4e [NETBEANS-4927] Maven EAR project fails to deploy on an app
server (GlassFish)
new c19712fd36 Merge pull request #4929 from
OndroMih/ondromih-fix-ear-deployment
59382d6b4e is described below
commit 59382d6b4e91c45b126006b536795bc707dcc641
Author: Ondro Mihalyi
AuthorDate: Sun Nov 6 00:03:51 2022 +0100
[NETBEANS-4927] Maven EAR project fails to deploy on an app server
(GlassFish)
---
.../impl/InitialServerFileDistributor.java | 108 ++---
1 file changed, 95 insertions(+), 13 deletions(-)
diff --git
a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/InitialServerFileDistributor.java
b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/InitialServerFileDistributor.java
index 65cc19b5a4..095f9838d5 100644
---
a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/InitialServerFileDistributor.java
+++
b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/InitialServerFileDistributor.java
@@ -16,11 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-
package org.netbeans.modules.j2ee.deployment.impl;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -29,6 +26,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.channels.FileChannel;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
@@ -53,11 +51,12 @@ import org.openide.util.Utilities;
/**
*
- * @author nn136682
+ * @author nn136682
*/
public class InitialServerFileDistributor extends ServerProgress {
private static final Logger LOGGER =
Logger.getLogger(InitialServerFileDistributor.class.getName());
+private static final String SYSTEM_PROPERTY_PREFIX = "glassfish.javaee";
private final ServerString serverString;
private final DeploymentTarget dtarget;
@@ -65,7 +64,6 @@ public class InitialServerFileDistributor extends
ServerProgress {
private final Target target;
boolean inPlace = false;
-
public InitialServerFileDistributor(DeploymentTarget dtarget, Target
target) {
super(dtarget.getServer().getServerInstance());
this.serverString = dtarget.getServer();
@@ -96,22 +94,24 @@ public class InitialServerFileDistributor extends
ServerProgress {
}
setStatusDistributeRunning(NbBundle.getMessage(
-InitialServerFileDistributor.class,
"MSG_RunningInitialDeploy", dtarget.getDeploymentName(), dir));
+InitialServerFileDistributor.class,
"MSG_RunningInitialDeploy", dtarget.getDeploymentName(), dir));
-_distribute(source.getArchiveContents(), dir,
collectChildModuleNames(source));
+final Set childModuleNames =
collectChildModuleNames(source);
+_distribute(source.getArchiveContents(), dir, childModuleNames);
if (source instanceof J2eeApplication) {
J2eeModule[] childModules = ((J2eeApplication)
source).getModules();
for (int i = 0; i < childModules.length; i++) {
-String uri = childModules[i].getUrl();
-J2eeModule childModule = deployment.getJ2eeModule(uri);
-File subdir = incDeployment.getDirectoryForNewModule(dir,
uri, childModule, deployment.getModuleConfiguration());
+final String moduleUrl = childModules[i].getUrl();
+String subDirectoryForChildModule =
getBestMatchingChildModuleName(moduleUrl, childModuleNames);
+J2eeModule childModule =
deployment.getJ2eeModule(moduleUrl);
+File subdir = incDeployment.getDirectoryForNewModule(dir,
subDirectoryForChildModule, childModule, deployment.getModuleConfiguration());
_distribute(childModules[i].getArchiveContents(), subdir,
null);
}
}
setStatusDistributeCompleted(NbBundle.getMessage(
-InitialServerFileDistributor.class,
"MSG_DoneInitialDistribute", dtarget.getDeploymentName()));
+InitialServerFileDistributor.class,
"MSG_DoneInitialDistribute", dtarget.getDeploymentName()));
return dir;
@@ -125,11 +125,90 @@ public class InitialServerFileDistributor extends
ServerProgress {
return null;
}
+private String getBestMatchingChildModuleName(String url, Set
childModuleNames) {
+if (childModuleNames.contains(url)) {
+return url;
+} else {
+
[netbeans] branch master updated: Adding org.eclipse.lsp4j.debug asnd org.eclipse.lsp4j.jsonrpc.debug dependencies
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 46b3c2990e Adding org.eclipse.lsp4j.debug asnd
org.eclipse.lsp4j.jsonrpc.debug dependencies
new 297109f9b8 Merge pull request #5971 from albilu/master
46b3c2990e is described below
commit 46b3c2990e7734f0be53448d01281b18a855092a
Author: Al Bilu
AuthorDate: Sat May 20 10:39:50 2023 +0200
Adding org.eclipse.lsp4j.debug asnd org.eclipse.lsp4j.jsonrpc.debug
dependencies
---
ide/lsp.client/external/binaries-list| 2 ++
ide/lsp.client/external/lsp4j-0.13.0-license.txt | 2 +-
ide/lsp.client/nbproject/project.properties | 4 +++-
ide/lsp.client/nbproject/project.xml | 8
nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 4 +++-
5 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ide/lsp.client/external/binaries-list
b/ide/lsp.client/external/binaries-list
index 0832017290..dd1dd5db2f 100644
--- a/ide/lsp.client/external/binaries-list
+++ b/ide/lsp.client/external/binaries-list
@@ -18,6 +18,8 @@
E95BD5C2A465A40A66C9DC098BF95C237B80C4EB
org.eclipse.lsp4j:org.eclipse.lsp4j:0.13.0
82848D7796D399F3E5109B7331A143D7C649B520
org.eclipse.lsp4j:org.eclipse.lsp4j.generator:0.13.0
0B50BD2A6AF496803F72176AD066532DAE62574E
org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.13.0
+A491B7AC91B35EC177DE629518D5A68A9C7878FC
org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.13.0
+68AB471B1FED84FABA25D6CE9005B9369B503A74
org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc.debug:0.13.0
A57306D5D523A4750FA09B2708062EA4972AFEA2
org.eclipse.xtend:org.eclipse.xtend.lib:2.24.0
D8F5566BA67748ED9E91856E077EE99F00E86653
org.eclipse.xtend:org.eclipse.xtend.lib.macro:2.24.0
53FBD66084B08850258E61C838CC1FB94335E718
org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.24.0
diff --git a/ide/lsp.client/external/lsp4j-0.13.0-license.txt
b/ide/lsp.client/external/lsp4j-0.13.0-license.txt
index 7ba9d3c0c4..2729106479 100644
--- a/ide/lsp.client/external/lsp4j-0.13.0-license.txt
+++ b/ide/lsp.client/external/lsp4j-0.13.0-license.txt
@@ -4,7 +4,7 @@ Version: 0.13.0
License: EPL-v20
URL: http://www.eclipse.org/
Description: Eclipse Language Server Protocol Library
-Files: org.eclipse.lsp4j-0.13.0.jar org.eclipse.lsp4j.generator-0.13.0.jar
org.eclipse.lsp4j.jsonrpc-0.13.0.jar
+Files: org.eclipse.lsp4j-0.13.0.jar org.eclipse.lsp4j.generator-0.13.0.jar
org.eclipse.lsp4j.jsonrpc-0.13.0.jar org.eclipse.lsp4j.debug-0.13.0.jar
org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar
Eclipse Public License - v 2.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
diff --git a/ide/lsp.client/nbproject/project.properties
b/ide/lsp.client/nbproject/project.properties
index 77cfdb51c0..eb47142d69 100644
--- a/ide/lsp.client/nbproject/project.properties
+++ b/ide/lsp.client/nbproject/project.properties
@@ -21,7 +21,9 @@ javadoc.arch=${basedir}/arch.xml
release.external/org.eclipse.lsp4j-0.13.0.jar=modules/ext/org.eclipse.lsp4j-0.13.0.jar
release.external/org.eclipse.lsp4j.generator-0.13.0.jar=modules/ext/org.eclipse.lsp4j.generator-0.13.0.jar
release.external/org.eclipse.lsp4j.jsonrpc-0.13.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc-0.13.0.jar
+release.external/org.eclipse.lsp4j.debug-0.13.0.jar=modules/ext/org.eclipse.lsp4j.debug-0.13.0.jar
+release.external/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar
release.external/org.eclipse.xtend.lib-2.24.0.jar=modules/ext/org.eclipse.xtend.lib-2.24.0.jar
release.external/org.eclipse.xtend.lib.macro-2.24.0.jar=modules/ext/org.eclipse.xtend.lib.macro-2.24.0.jar
release.external/org.eclipse.xtext.xbase.lib-2.24.0.jar=modules/ext/org.eclipse.xtext.xbase.lib-2.24.0.jar
-spec.version.base=1.21.0
+spec.version.base=1.22.0
\ No newline at end of file
diff --git a/ide/lsp.client/nbproject/project.xml
b/ide/lsp.client/nbproject/project.xml
index 02825de63c..e95efcb12a 100644
--- a/ide/lsp.client/nbproject/project.xml
+++ b/ide/lsp.client/nbproject/project.xml
@@ -437,6 +437,14 @@
ext/org.eclipse.lsp4j.jsonrpc-0.13.0.jar
external/org.eclipse.lsp4j.jsonrpc-0.13.0.jar
+
+
ext/org.eclipse.lsp4j.debug-0.13.0.jar
+
external/org.eclipse.lsp4j.debug-0.13.0.jar
+
+
+
ext/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar
+
external/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar
+
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
b/nbbuild/antsrc/org/netbeans
[netbeans] branch master updated (79cc0034d4 -> c91fb3d010)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 79cc0034d4 Merge pull request #6070 from neilcsmith-net/flat-tab-cards new a920c5f039 Ensure common project actions are available in Rust projects new b8557c3f1f Ensure all Cargo commands can actually be run and don't fail with MissingResourceException new 307594e2ff Ensure common project actions are available in Rust projects (2) new c91fb3d010 Merge pull request #6086 from matthiasblaesing/rust_common_project_actions The 8721 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/rust/cargo/api/CargoCommand.java | 17 +- rust/rust.project/nbproject/project.xml| 18 + .../netbeans/modules/rust/project/RustProject.java | 1 + .../rust/project/RustProjectActionProvider.java| 87 ++--- .../rust/project/RustProjectOperations.java| 403 + .../org/netbeans/modules/rust/project/layer.xml| 46 ++- .../rust/project/ui/RustProjectRootNode.java | 39 ++ .../project/ui/actions/CargoExecutionCommand.java | 69 .../modules/rust/project/ui/actions/Command.java | 95 + .../rust/project/ui/actions/CopyCommand.java | 46 +++ .../rust/project/ui/actions/DeleteCommand.java | 46 +++ .../rust/project/ui/actions/GlobalCommand.java | 42 +++ .../rust/project/ui/actions/MoveCommand.java | 46 +++ .../rust/project/ui/actions/RenameCommand.java | 46 +++ .../rust/project/RustProjectOperationsTest.java| 95 + .../project/data/Reference.Cargo.DottedName.toml | 7 + .../modules/rust/project/data/Reference.Cargo.toml | 8 + .../rust/project/data/Test.Cargo.DottedName.toml | 7 + .../data/Test.Cargo.LiteralMultilineString.toml| 9 + .../project/data/Test.Cargo.LiteralString.toml | 8 + .../project/data/Test.Cargo.MultilineString.toml | 9 + .../rust/project/data/Test.Cargo.String.toml | 8 + 22 files changed, 1098 insertions(+), 54 deletions(-) create mode 100644 rust/rust.project/src/org/netbeans/modules/rust/project/RustProjectOperations.java create mode 100644 rust/rust.project/src/org/netbeans/modules/rust/project/ui/actions/CargoExecutionCommand.java create mode 100644 rust/rust.project/src/org/netbeans/modules/rust/project/ui/actions/Command.java create mode 100644 rust/rust.project/src/org/netbeans/modules/rust/project/ui/actions/CopyCommand.java create mode 100644 rust/rust.project/src/org/netbeans/modules/rust/project/ui/actions/DeleteCommand.java create mode 100644 rust/rust.project/src/org/netbeans/modules/rust/project/ui/actions/GlobalCommand.java create mode 100644 rust/rust.project/src/org/netbeans/modules/rust/project/ui/actions/MoveCommand.java create mode 100644 rust/rust.project/src/org/netbeans/modules/rust/project/ui/actions/RenameCommand.java create mode 100644 rust/rust.project/test/unit/src/org/netbeans/modules/rust/project/RustProjectOperationsTest.java create mode 100644 rust/rust.project/test/unit/src/org/netbeans/modules/rust/project/data/Reference.Cargo.DottedName.toml create mode 100644 rust/rust.project/test/unit/src/org/netbeans/modules/rust/project/data/Reference.Cargo.toml create mode 100644 rust/rust.project/test/unit/src/org/netbeans/modules/rust/project/data/Test.Cargo.DottedName.toml create mode 100644 rust/rust.project/test/unit/src/org/netbeans/modules/rust/project/data/Test.Cargo.LiteralMultilineString.toml create mode 100644 rust/rust.project/test/unit/src/org/netbeans/modules/rust/project/data/Test.Cargo.LiteralString.toml create mode 100644 rust/rust.project/test/unit/src/org/netbeans/modules/rust/project/data/Test.Cargo.MultilineString.toml create mode 100644 rust/rust.project/test/unit/src/org/netbeans/modules/rust/project/data/Test.Cargo.String.toml - 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 (fb9e029bda -> 20a867a0c8)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from fb9e029bda Languages.hcl terraform semantic highlights (#6081) new d1300be50b Limit the OpenFX wrapper modules to the supported CPU architectures new 0757aad7b4 Update OpenJFX to 17.0.7 and add support for mac OS and Linux on Aarch64 new 20a867a0c8 Merge pull request #6028 from matthiasblaesing/javafx_update The 8698 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/ide/ergonomics/DynamicVerifyTest.java | 2 + .../build.xml} | 21 +-- .../external/binaries-list | 12 +++--- .../javafx-base-17.0.7-linux-aarch64.jar.external | 4 ++ ...vafx-controls-17.0.7-linux-aarch64.jar.external | 4 ++ ...vafx-graphics-17.0.7-linux-aarch64.jar.external | 4 ++ .../javafx-linux-aarch64-17.0.7-license.txt} | 6 +-- .../javafx-media-17.0.7-linux-aarch64.jar.external | 4 ++ .../javafx-swing-17.0.7-linux-aarch64.jar.external | 4 ++ .../javafx-web-17.0.7-linux-aarch64.jar.external | 4 ++ .../licenseinfo.xml| 12 +++--- .../manifest.mf| 8 ++-- .../nbproject/project.properties | 36 ++ .../nbproject/project.xml | 26 ++--- .../libs/javafx/linux/aarch64}/Bundle.properties | 2 +- extra/libs.javafx.linux/external/binaries-list | 12 +++--- .../external/javafx-base-17-linux.jar.external | 4 -- .../external/javafx-base-17.0.7-linux.jar.external | 4 ++ .../external/javafx-controls-17-linux.jar.external | 4 -- .../javafx-controls-17.0.7-linux.jar.external | 4 ++ .../external/javafx-graphics-17-linux.jar.external | 4 -- .../javafx-graphics-17.0.7-linux.jar.external | 4 ++ ...license.txt => javafx-linux-17.0.7-license.txt} | 6 +-- .../external/javafx-media-17-linux.jar.external| 4 -- .../javafx-media-17.0.7-linux.jar.external | 4 ++ .../external/javafx-swing-17-linux.jar.external| 4 -- .../javafx-swing-17.0.7-linux.jar.external | 4 ++ .../external/javafx-web-17-linux.jar.external | 4 -- .../external/javafx-web-17.0.7-linux.jar.external | 4 ++ extra/libs.javafx.linux/licenseinfo.xml| 12 +++--- extra/libs.javafx.linux/manifest.mf| 4 +- .../libs.javafx.linux/nbproject/project.properties | 24 ++-- extra/libs.javafx.linux/nbproject/project.xml | 24 ++-- .../netbeans/libs/javafx/linux/Bundle.properties | 2 +- .../build.xml} | 21 +-- .../external/binaries-list | 12 +++--- .../javafx-base-17.0.7-mac-aarch64.jar.external| 4 ++ ...javafx-controls-17.0.7-mac-aarch64.jar.external | 4 ++ ...javafx-graphics-17.0.7-mac-aarch64.jar.external | 4 ++ .../javafx-mac-aarch64-17.0.7-license.txt} | 6 +-- .../javafx-media-17.0.7-mac-aarch64.jar.external | 4 ++ .../javafx-swing-17.0.7-mac-aarch64.jar.external | 4 ++ .../javafx-web-17.0.7-mac-aarch64.jar.external | 4 ++ .../licenseinfo.xml| 12 +++--- .../manifest.mf| 8 ++-- .../nbproject/project.properties | 36 ++ .../nbproject/project.xml | 26 ++--- .../libs/javafx/macosx/aarch64}/Bundle.properties | 2 +- extra/libs.javafx.macosx/external/binaries-list| 12 +++--- .../external/javafx-base-17-mac.jar.external | 4 -- .../external/javafx-base-17.0.7-mac.jar.external | 4 ++ .../external/javafx-controls-17-mac.jar.external | 4 -- .../javafx-controls-17.0.7-mac.jar.external| 4 ++ .../external/javafx-graphics-17-mac.jar.external | 4 -- .../javafx-graphics-17.0.7-mac.jar.external| 4 ++ ...7-license.txt => javafx-mac-17.0.7-license.txt} | 6 +-- .../external/javafx-media-17-mac.jar.external | 4 -- .../external/javafx-media-17.0.7-mac.jar.external | 4 ++ .../external/javafx-swing-17-mac.jar.external | 4 -- .../external/javafx-swing-17.0.7-mac.jar.external | 4 ++ .../external/javafx-web-17-mac.jar.external| 4 -- .../external/javafx-web-17.0.7-mac.jar.external| 4 ++ extra/libs.javafx.macosx/licenseinfo.xml | 12 +++--- extra/libs.javafx.macosx/manifest.mf | 4 +- .../nbproject/project.properties | 24 ++-- extra/libs.javafx.macosx/nbproject/project.xml | 24 ++-- .../netbeans/libs/javafx/macosx/Bundle.properties | 2 +- extra/libs.javafx.
[netbeans] branch master updated (2ad408e1f4 -> c577be119a)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 2ad408e1f4 Merge pull request #6073 from mbien/multitab-underline-rendering-fix new fff063e6c1 CSS: add user-select property new 5a3ac38f0b CSS: add user-select property (move into separate module) new c577be119a Merge pull request #5830 from pquiring/patch-1 The 8685 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/css/editor/module/main/DefaultCssEditorModule.java| 3 ++- .../modules/css/editor/module/main/properties/other.properties| 4 ++-- .../modules/css/editor/module/main/properties/text.properties | 2 +- .../css/editor/module/main/StandardPropertiesHelpResolverTest.java| 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) copy apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties => ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/other.properties (86%) - 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 (75d723505c -> 9338afd3e3)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 75d723505c Merge pull request #5877 from matthiasblaesing/jpda_edt new 962ec7fb8b Retain information whether function was generated new a9ae09b5e3 Fix handling of class constructor in classes in anonymous functions new 9338afd3e3 Merge pull request #5951 from matthiasblaesing/javascript_constructor The 8669 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: webcommon/javascript2.model/nbproject/project.xml | 2 +- .../modules/javascript2/model/ModelVisitor.java| 18 ++-- .../unit/data/testfiles/model/classConstructor.js | 44 +++ .../data/testfiles/model/classConstructor.js.model | 51 ++ .../modules/javascript2/model/ModelTest.java | 4 ++ webcommon/libs.nashorn/manifest.mf | 2 +- .../src/com/oracle/js/parser/Parser.java | 1 + .../src/com/oracle/js/parser/ir/FunctionNode.java | 7 +++ .../src/com/oracle/js/parser/DumpingVisitor.java | 4 +- .../unit/src/com/oracle/js/parser/ParserTest.java | 34 +++ 10 files changed, 161 insertions(+), 6 deletions(-) create mode 100644 webcommon/javascript2.model/test/unit/data/testfiles/model/classConstructor.js create mode 100644 webcommon/javascript2.model/test/unit/data/testfiles/model/classConstructor.js.model - 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: JPDA Evaluator: Value, Description and Children should not be fetched on the EDT
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing 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 d505b71a9b JPDA Evaluator: Value, Description and Children should not be fetched on the EDT new 75d723505c Merge pull request #5877 from matthiasblaesing/jpda_edt d505b71a9b is described below commit d505b71a9bdfd56b38f061f775fda4f1c12b9488 Author: Matthias Bläsing AuthorDate: Mon Apr 24 21:15:53 2023 +0200 JPDA Evaluator: Value, Description and Children should not be fetched on the EDT While running NetBeans with assertions enabled, while tryping to open the detail/value dialog for the "String value", an AssertionError was observed. java.lang.AssertionError: Debugger lock taken in AWT Event Queue! at org.netbeans.modules.debugger.jpda.JPDADebuggerImpl$DebuggerReentrantReadWriteLock$DebuggerReadLock.lock(JPDADebuggerImpl.java:2710) at org.netbeans.modules.debugger.jpda.models.JPDAThreadImpl$ThreadReentrantReadWriteLock$ThreadWriteLock.lock(JPDAThreadImpl.java:2581) at org.netbeans.modules.debugger.jpda.JPDADebuggerImpl.invokeMethod(JPDADebuggerImpl.java:1080) at org.netbeans.modules.debugger.jpda.JPDADebuggerImpl.invokeMethod(JPDADebuggerImpl.java:1022) at org.netbeans.modules.debugger.jpda.models.AbstractObjectVariable.getToStringValue(AbstractObjectVariable.java:500) at org.netbeans.modules.debugger.jpda.models.AbstractObjectVariable.getToStringValue(AbstractObjectVariable.java:464) at org.netbeans.modules.debugger.jpda.models.AbstractObjectVariable.getToStringValue(AbstractObjectVariable.java:428) at org.netbeans.modules.debugger.jpda.ui.models.VariablesTableModel.getValueAt(VariablesTableModel.java:108) at org.netbeans.spi.viewmodel.Models$DelegatingTableModel.getValueAt(Models.java:2249) at org.netbeans.modules.debugger.jpda.ui.models.NumericDisplayFilter.getValueAt(NumericDisplayFilter.java:112) at org.netbeans.spi.viewmodel.Models$CompoundTableModel.getValueAt(Models.java:1439) at org.netbeans.modules.debugger.jpda.ui.models.VariablesTreeModelFilter.getValueAt(VariablesTreeModelFilter.java:530) at org.netbeans.spi.viewmodel.Models$CompoundTableModel.getValueAt(Models.java:1439) at org.netbeans.modules.debugger.jpda.ui.models.EvaluatorTableModelFilter.getValueAt(EvaluatorTableModelFilter.java:71) at org.netbeans.spi.viewmodel.Models$CompoundTableModel.getValueAt(Models.java:1439) at org.netbeans.spi.viewmodel.Models$CompoundTableModel.getValueAt(Models.java:1441) at org.netbeans.spi.viewmodel.Models$CompoundTableModel.getValueAt(Models.java:1441) at org.netbeans.spi.viewmodel.Models$CompoundModel.getValueAt(Models.java:4565) at org.netbeans.modules.viewmodel.TreeModelNode$MyProperty.updateShortDescription(TreeModelNode.java:2094) at org.netbeans.modules.viewmodel.TreeModelNode$MyProperty.getShortDescription(TreeModelNode.java:2076) at org.openide.explorer.propertysheet.CustomEditorAction.actionPerformed(CustomEditorAction.java:290) at org.openide.explorer.propertysheet.PropertyPanel$CustomEditorProxyAction.actionPerformed(PropertyPanel.java:1199) at org.openide.explorer.view.OutlineView$OutlineViewOutline.editCellAt(OutlineView.java:2115) at java.desktop/javax.swing.plaf.basic.BasicTableUI$Handler.adjustSelection(BasicTableUI.java:1147) at java.desktop/javax.swing.plaf.basic.BasicTableUI$Handler.mousePressed(BasicTableUI.java:1077) Indeed here the call comes from the EDT and directly tries to access the JPDA connection. The fix is inspired from JPDAAsynchronousModel and moves value fetching from the EDT to the JPDA thread. --- .../jpda/ui/models/EvaluatorTableModelFilter.java | 43 +++--- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/EvaluatorTableModelFilter.java b/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/EvaluatorTableModelFilter.java index 5dc216241d..c0932190ed 100644 --- a/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/EvaluatorTableModelFilter.java +++ b/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/EvaluatorTableModelFilter.java @@ -21,38 +21,55 @@ package org.netbeans.modules.debugger.jpda.ui.models; import java.util.Collection; import java.util.HashSet; -import java.util.List; +import java.util.concurrent.Executor; +import org.netbeans.api.debugger.jpda.JPDADebugger; +import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl; +import org.netbeans.spi.debugger.ContextProvider; import org.netbeans.spi.debugger.DebuggerServiceRegistration; -import org.netbeans.spi.debugger.ui.CodeEvaluato
[netbeans] branch master updated: Fix specification version going backwards in web.beans and jakarta.web.beans
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing 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 3ade5d3f73 Fix specification version going backwards in web.beans and jakarta.web.beans new 38eb633622 Merge pull request #6001 from matthiasblaesing/version_web_beans 3ade5d3f73 is described below commit 3ade5d3f73b89c14d5ecd8b53638824eec42b445 Author: Matthias Bläsing AuthorDate: Tue May 30 19:23:27 2023 +0200 Fix specification version going backwards in web.beans and jakarta.web.beans --- enterprise/jakarta.web.beans/manifest.mf| 2 +- .../nbproject/org-netbeans-modules-jakarta-web-beans.sig| 2 +- enterprise/web.beans/manifest.mf| 2 +- enterprise/web.beans/nbproject/org-netbeans-modules-web-beans.sig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/enterprise/jakarta.web.beans/manifest.mf b/enterprise/jakarta.web.beans/manifest.mf index 3a8ae23a8c..28afd30e1f 100644 --- a/enterprise/jakarta.web.beans/manifest.mf +++ b/enterprise/jakarta.web.beans/manifest.mf @@ -2,5 +2,5 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.jakarta.web.beans/1 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jakarta/web/beans/resources/Bundle.properties OpenIDE-Module-Layer: org/netbeans/modules/jakarta/web/beans/resources/layer.xml -OpenIDE-Module-Specification-Version: 2.38 +OpenIDE-Module-Specification-Version: 2.40 AutoUpdate-Show-In-Client: false diff --git a/enterprise/jakarta.web.beans/nbproject/org-netbeans-modules-jakarta-web-beans.sig b/enterprise/jakarta.web.beans/nbproject/org-netbeans-modules-jakarta-web-beans.sig index 329df3b5bc..06e99d76cd 100644 --- a/enterprise/jakarta.web.beans/nbproject/org-netbeans-modules-jakarta-web-beans.sig +++ b/enterprise/jakarta.web.beans/nbproject/org-netbeans-modules-jakarta-web-beans.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 2.38 +#Version 2.40 CLSS public java.beans.FeatureDescriptor cons public init() diff --git a/enterprise/web.beans/manifest.mf b/enterprise/web.beans/manifest.mf index ec0b801282..3a3b9efadf 100644 --- a/enterprise/web.beans/manifest.mf +++ b/enterprise/web.beans/manifest.mf @@ -2,5 +2,5 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.web.beans/2 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/beans/resources/Bundle.properties OpenIDE-Module-Layer: org/netbeans/modules/web/beans/resources/layer.xml -OpenIDE-Module-Specification-Version: 2.38 +OpenIDE-Module-Specification-Version: 2.40 AutoUpdate-Show-In-Client: false diff --git a/enterprise/web.beans/nbproject/org-netbeans-modules-web-beans.sig b/enterprise/web.beans/nbproject/org-netbeans-modules-web-beans.sig index 6f182fefdd..e2d8727026 100644 --- a/enterprise/web.beans/nbproject/org-netbeans-modules-web-beans.sig +++ b/enterprise/web.beans/nbproject/org-netbeans-modules-web-beans.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 2.39 +#Version 2.40 CLSS public java.beans.FeatureDescriptor cons public init() - 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 (51ef8c6ebd -> 5ebcd009cc)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 51ef8c6ebd Merge pull request #5993 from matthiasblaesing/github-5990 new 6d8f186f45 [JS] Create special JSElement.Kind for arrow functions new 6a8144175b [JS] Improve resolving this in ClassElements and in arrow functions new 5ebcd009cc Merge pull request #5995 from matthiasblaesing/javascript_this_scoping The 8649 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: webcommon/html.angular/nbproject/project.xml | 2 +- .../angular/editor/AngularJsCodeCompletion.java| 5 +++- .../html/angular/model/AngularWhenInterceptor.java | 3 ++- .../modules/html/angular/model/ModelUtils.java | 11 +--- webcommon/javascript2.editor/nbproject/project.xml | 2 +- .../javascript2/editor/JsCompletionItem.java | 1 + .../javascript2/editor/JsSemanticAnalyzer.java | 1 + .../editor/doc/JsDocumentationCompleter.java | 7 +++-- .../javascript2/editor/index/JsIndexer.java| 2 +- .../test/unit/data/testfiles/hints/issueGH5740.js | 23 .../hints/issueGH5740.js.testIssueGH5740.hints | 0 .../indexer/SelfreferencingFunction.js.indexed | 2 +- .../data/testfiles/markoccurences/issueGH4376.js | 29 .../markoccurences/issueGH4376.js.structure| 3 +++ .../issueGH4376.js.testIssueGH4376_01.occurrences | 3 +++ .../issueGH4376.js.testIssueGH4376_02.occurrences | 3 +++ .../editor/hint/JsGlobalIsNotDeclaredTest.java | 31 -- .../editor/navigation/MarkOccurrenceTest.java | 12 + .../javascript2.knockout/nbproject/project.xml | 2 +- .../javascript2/knockout/model/ModelUtils.java | 11 +--- webcommon/javascript2.model/manifest.mf| 2 +- .../modules/javascript2/model/JsElementImpl.java | 2 ++ .../modules/javascript2/model/JsFunctionImpl.java | 3 --- .../modules/javascript2/model/ModelVisitor.java| 26 +- .../javascript2/model/api/IndexedElement.java | 3 +++ .../modules/javascript2/model/api/JsElement.java | 6 +++-- .../modules/javascript2/model/api/ModelUtils.java | 3 ++- 27 files changed, 155 insertions(+), 43 deletions(-) create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/hints/issueGH5740.js copy contrib/groovy.grailsproject/test/unit/data/projects/completion/stacktrace.log => webcommon/javascript2.editor/test/unit/data/testfiles/hints/issueGH5740.js.testIssueGH5740.hints (100%) create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/issueGH4376.js create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/issueGH4376.js.structure create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/issueGH4376.js.testIssueGH4376_01.occurrences create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/issueGH4376.js.testIssueGH4376_02.occurrences - 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: Ensure tomcat basedirectory is configured and in a writeable location
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 8c7caf101c Ensure tomcat basedirectory is configured and in a
writeable location
new 51ef8c6ebd Merge pull request #5993 from matthiasblaesing/github-5990
8c7caf101c is described below
commit 8c7caf101c60bcd313e8f518c3fb19252102e879
Author: Matthias Bläsing
AuthorDate: Fri May 26 20:24:26 2023 +0200
Ensure tomcat basedirectory is configured and in a writeable location
Tomcat by default places its working directory in the current working
directory. This clutters the directory tree and is problematic if the
current working directory is not writeable.
Closes: #5990
---
.../src/org/netbeans/modules/httpserver/HttpServerModule.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/ide/httpserver/src/org/netbeans/modules/httpserver/HttpServerModule.java
b/ide/httpserver/src/org/netbeans/modules/httpserver/HttpServerModule.java
index 3087e31ab9..4a1cd7999c 100644
--- a/ide/httpserver/src/org/netbeans/modules/httpserver/HttpServerModule.java
+++ b/ide/httpserver/src/org/netbeans/modules/httpserver/HttpServerModule.java
@@ -174,7 +174,10 @@ public class HttpServerModule extends ModuleInstall
implements Externalizable {
private static void buildServer() throws Exception {
+File httpwork = Places.getCacheSubdirectory("httpwork");
+File httpworkBase = Places.getCacheSubdirectory("httpwork-base");
tomcat = new Tomcat();
+tomcat.setBaseDir(httpworkBase.getAbsolutePath());
tomcat.setPort(httpserverSettings().getPort());
tomcat.getServer().setUtilityThreads(1);
tomcat.getConnector().setXpoweredBy(false);
@@ -185,8 +188,7 @@ public class HttpServerModule extends ModuleInstall
implements Externalizable {
ThreadPoolExecutor tf = new ThreadPoolExecutor(0, 3, 60,
TimeUnit.SECONDS, tq);
tomcat.getConnector().getProtocolHandler().setExecutor(tf);
-File wd = Places.getCacheSubdirectory("httpwork");
-Context ctx = tomcat.addContext("", wd.getAbsolutePath());
+Context ctx = tomcat.addContext("", httpwork.getAbsolutePath());
if(ctx instanceof StandardContext) {
((StandardContext) ctx).setClearReferencesRmiTargets(false);
-
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: [JS] Fix ConcurrentModificationException scanning export class {} with multiple members
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 f4db42eb02 [JS] Fix ConcurrentModificationException scanning export
class {} with multiple members
new 9b87a377c6 Merge pull request #5983 from
matthiasblaesing/js_concurrent_modification_exception
f4db42eb02 is described below
commit f4db42eb02125a1f9184df16d24aad26dde91e8b
Author: Matthias Bläsing
AuthorDate: Tue May 23 21:12:02 2023 +0200
[JS] Fix ConcurrentModificationException scanning export class {} with
multiple members
Fix applies same pattern, that is used in other places where
ModelUtils#moveProperty is invoked.
---
.../modules/javascript2/model/ModelVisitor.java| 5 +++--
.../data/testfiles/structure/issueGH5184_03.js | 25 ++
.../testfiles/structure/issueGH5184_03.js.model| 12 +++
.../modules/javascript2/model/ModelTest.java | 4
4 files changed, 44 insertions(+), 2 deletions(-)
diff --git
a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java
b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java
index 7ca7de8280..74cc9471fa 100644
---
a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java
+++
b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java
@@ -712,8 +712,9 @@ public class ModelVisitor extends PathNodeVisitor
implements ModelResolver {
);
JsObject origClassObject = parent.getProperty(className.getName());
if (origClassObject != null) {
-for (Entry e :
origClassObject.getProperties().entrySet()) {
-ModelUtils.moveProperty(classObject, e.getValue());
+List properties = new
ArrayList<>(origClassObject.getProperties().values());
+for (JsObject property : properties) {
+ModelUtils.moveProperty(classObject, property);
}
}
parent.addProperty(className.getName(), classObject);
diff --git
a/webcommon/javascript2.model/test/unit/data/testfiles/structure/issueGH5184_03.js
b/webcommon/javascript2.model/test/unit/data/testfiles/structure/issueGH5184_03.js
new file mode 100644
index 00..1303049e1b
--- /dev/null
+++
b/webcommon/javascript2.model/test/unit/data/testfiles/structure/issueGH5184_03.js
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+export class test {
+field1 = "Value1";
+
+method1() {
+}
+}
\ No newline at end of file
diff --git
a/webcommon/javascript2.model/test/unit/data/testfiles/structure/issueGH5184_03.js.model
b/webcommon/javascript2.model/test/unit/data/testfiles/structure/issueGH5184_03.js.model
new file mode 100644
index 00..70f70b48ae
--- /dev/null
+++
b/webcommon/javascript2.model/test/unit/data/testfiles/structure/issueGH5184_03.js.model
@@ -0,0 +1,12 @@
+FUNCTION issueGH5184_03 [ANONYMOUS: false, DECLARED: true - issueGH5184_03,
MODIFIERS: PUBLIC, FILE]
+# RETURN TYPES
+undefined, RESOLVED: true
+# PROPERTIES
+test : OBJECT test [ANONYMOUS: false, DECLARED: true - test, MODIFIERS:
PUBLIC, CLASS]
+ # PROPERTIES
+ field1 : OBJECT field1 [ANONYMOUS: false, DECLARED: true - field1,
MODIFIERS: PUBLIC, PROPERTY]
+ method1 : FUNCTION method1 [ANONYMOUS: false, DECLARED: true - method1,
MODIFIERS: PUBLIC, METHOD]
+ # RETURN TYPES
+ undefined, RESOLVED: true
+ # PROPERTIES
+ arguments : OBJECT arguments [ANONYMOUS: false, DECLARED: false -
arguments, MODIFIERS: PRIVATE, VARIABLE]
diff --git
a/webcommon/javascript2.model/test/unit/src/org/netbeans/modules/javascript2/model/ModelTest.java
b/webcommon/javascript2.model/test/unit/src/org/netbeans/modules/javascript2/model/ModelTest.java
index 494b8adcab..e7c5b63ace 100644
---
a/webcommon/javascript2.model/test/unit/src/org/netbeans/modules/javascript2/m
[netbeans] branch master updated: On JDKs without JavaFX/OpenFX libs.javafx has unsatisfiable package dependency
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing 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 4aacfa67c1 On JDKs without JavaFX/OpenFX libs.javafx has unsatisfiable package dependency new 06d047deb2 Merge pull request #6010 from matthiasblaesing/javafx_fix 4aacfa67c1 is described below commit 4aacfa67c1065762cde3d6de877e1b96b00efd96 Author: Matthias Bläsing AuthorDate: Thu Jun 1 19:22:41 2023 +0200 On JDKs without JavaFX/OpenFX libs.javafx has unsatisfiable package dependency With this commit: commit 15811ec850cc3cfe50eeaffd96c2eae1065ccb9c Author: Svata Dedic Date: Tue Apr 18 14:10:14 2023 +0200 Allow java and (system) package dependencies for eager modules. Provider autoloads with failed dependencies have problems reported. dependency checking was improved and in turn module configurations that worked by luck failed to load. For libs.javafx the situation is trivial on JDKs that bundle JavaFX/OpenJFX. In these cases the JDK provides the OpenJFX classes, which is detected by the module system and the token org.openide.modules.jre.JavaFX is automatically provded. On other JDKs OpenJFX is loaded from a set of org.netbeans.libs.javafx. modules onto the classpath and these modules provide the mentioned token. Before this change libs.javafx had this manifest entry: OpenIDE-Module-Package-Dependencies: javafx.application[Application] With the improved checking this requirement fails on JDK not bundling JavaFX/OpenJFX. For these cases both the fragement host org.netbeans.libs.javafx and one of the provider modules, for example org.netbeans.libs.javafx.linux would need to be loaded together to be able to satisfy the dependency. This PR removed the package dependency as it provides no additonal value, as the presence of the token org.openide.modules.jre.JavaFX reports presense of native support. Closes: #6004 --- platform/libs.javafx/manifest.mf | 3 +- platform/libs.javafx/nbproject/project.xml | 14 - .../org/netbeans/libs/javafx/IsFXEnabledTest.java | 61 -- 3 files changed, 1 insertion(+), 77 deletions(-) diff --git a/platform/libs.javafx/manifest.mf b/platform/libs.javafx/manifest.mf index 03feba6316..0c6cadfbff 100644 --- a/platform/libs.javafx/manifest.mf +++ b/platform/libs.javafx/manifest.mf @@ -1,6 +1,5 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.libs.javafx -OpenIDE-Module-Package-Dependencies: javafx.application[Application] OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javafx/Bundle.properties OpenIDE-Module-Specification-Version: 2.28 OpenIDE-Module-Needs: org.openide.modules.jre.JavaFX @@ -38,4 +37,4 @@ OpenIDE-Module-Provides: javafx.animation, javafx.util, javafx.util.converter, netscape.javascript -Class-Path: %24%7Bjava.home%7D/lib/ext/jfxrt.jar +Class-Path: %24%7Bjava.home%7D/lib/ext/jfxrt.jar \ No newline at end of file diff --git a/platform/libs.javafx/nbproject/project.xml b/platform/libs.javafx/nbproject/project.xml index e2313422b9..e745496636 100644 --- a/platform/libs.javafx/nbproject/project.xml +++ b/platform/libs.javafx/nbproject/project.xml @@ -42,20 +42,6 @@ - - -unit - - org.netbeans.libs.junit4 - - - - org.netbeans.modules.nbjunit - - - - - javafx.animation javafx.application diff --git a/platform/libs.javafx/test/unit/src/org/netbeans/libs/javafx/IsFXEnabledTest.java b/platform/libs.javafx/test/unit/src/org/netbeans/libs/javafx/IsFXEnabledTest.java deleted file mode 100644 index c9301d9196..00 --- a/platform/libs.javafx/test/unit/src/org/netbeans/libs/javafx/IsFXEnabledTest.java +++ /dev/null @@ -1,61 +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 WARR
[netbeans-tools] branch master updated: Pluginportal: Plugin can't be added because version can't be stored
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 3d5a740 Pluginportal: Plugin can't be added because version can't be
stored
new acee5db Merge pull request #65 from
matthiasblaesing/versionfield_length
3d5a740 is described below
commit 3d5a740bfe10b270362e6423a8a14cfc5c2d918b
Author: Matthias Bläsing
AuthorDate: Sat Apr 29 19:58:59 2023 +0200
Pluginportal: Plugin can't be added because version can't be stored
The db structure for the plugin portal has different size restrictions
for version fields. This unifies the version fields to a size of 50
chars.
---
pp3/config/pp3.sql | 5 +
pp3/module/Application/src/Application/Entity/Plugin.php | 4
2 files changed, 9 insertions(+)
diff --git a/pp3/config/pp3.sql b/pp3/config/pp3.sql
index 6cf372e..725c0ef 100644
--- a/pp3/config/pp3.sql
+++ b/pp3/config/pp3.sql
@@ -154,6 +154,11 @@ insert into plugin_user SELECT id, author_id FROM plugin;
ALTER TABLE plugin DROP COLUMN author_id;
+ALTER TABLE nb_version MODIFY COLUMN version varchar(50) NOT NULL;
+ALTER TABLE plugin_version MODIFY COLUMN version varchar(50) NOT NULL;
+ALTER TABLE plugin MODIFY COLUMN latest_version varchar(50) NOT NULL;
+ALTER TABLE plugin MODIFY COLUMN release_version varchar(50) NOT NULL;
+
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/pp3/module/Application/src/Application/Entity/Plugin.php
b/pp3/module/Application/src/Application/Entity/Plugin.php
index eee48e1..caeccd0 100644
--- a/pp3/module/Application/src/Application/Entity/Plugin.php
+++ b/pp3/module/Application/src/Application/Entity/Plugin.php
@@ -22,6 +22,7 @@ namespace Application\Entity;
use Doctrine\ORM\Mapping as ORM;
use Application\Entity\PluginVersion;
+use Application\Pp\MavenDataLoader;
/**
* @ORM\Entity
@@ -32,6 +33,9 @@ class Plugin extends Base\Plugin {
const STATUS_PRIVATE = 1;
const STATUS_PUBLIC = 2;
+/**
+ * @var MavenDataLoader
+ */
private $_dataLoader;
public function setDataLoader($dl) {
-
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 (9f50632a0a -> 7ae3345f5d)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 9f50632a0a Merge pull request #5763 from
jlahoda/evaluate-binding-variable
new 87543274a0 Jakarta EE 10 - JPA 3.1 support
new f42831b8ef orm_3_1.xsd license info
new 95379d8062 Fixes typo
new b2f1733436 JPA 3.1 as default version
new 82916afbf6 isEE9Supported & isEE10Supported signature update
new e1e883a3d6 isEE9Supported & isEE10Supported signature update (2)
new 11b69789c3 - Add persistence 3.1 xml and xsd support - Remove
redundant orm_3_1 entry in licenseinfo file
new 8c1762f780 Add JPA 3.x support for Hibernate and DataNucleus providers
new cf17f6b415 Add missing validations for JPA 3.x
new 26c7937932 Add JPA 3.0 persistence unit properties
new b4ccf9229c For persistence unit completor replace javax.persistence
with jakarta.persistence when JPA is equal or greater than 3.0
new eb562a9fb0 Remove logging
new 61e72785bc JPA 1.0, 2.0, 2.1 and 2.2 are not supported by GlassFish 6
and upward
new 7ae3345f5d Merge pull request #4687 from jGauravGupta/jpa_3_1
The 8497 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/modules/form/j2ee/J2EEUtils.java | 10 +-
.../modules/j2ee/jboss4/ide/JpaSupportImpl.java| 2 +-
.../glassfish/javaee/Hk2JpaSupportImpl.java| 37 +--
.../modules/glassfish/javaee/RunTimeDDCatalog.java | 7 ++
.../j2ee/ejbjarproject/EjbJarJPAModuleInfo.java| 4 +-
.../api/PersistenceProviderSupplierImpl.java | 6 +-
.../org-netbeans-modules-javaee-specs-support.sig | 6 +-
.../javaee/specs/support/api/JpaProvider.java | 10 +-
.../support/bridge/BridgingJpaSupportImpl.java | 8 +-
.../specs/support/spi/JpaProviderFactory.java | 12 ++-
.../support/spi/JpaProviderImplementation.java | 4 +
.../modules/javaee/wildfly/ide/JpaSupportImpl.java | 8 +-
.../netbeans/modules/maven/j2ee/JPAStuffImpl.java | 4 +-
.../modules/payara/common/ServerDetails.java | 10 ++
.../payara/jakartaee/Hk2JpaSupportImpl.java| 23 -
.../modules/payara/jakartaee/RunTimeDDCatalog.java | 9 +-
.../org-netbeans-modules-payara-tooling.sig| 6 ++
.../payara/tooling/data/PayaraPlatformVersion.java | 10 ++
.../tooling/data/PayaraPlatformVersionAPI.java | 4 +
.../modules/payara/tooling/data/PayaraVersion.java | 10 ++
.../modules/tomcat5/deploy/TomcatManager.java | 6 +-
.../modules/tomcat5/j2ee/JpaSupportImpl.java | 12 ++-
.../modules/web/project/WebJPAModuleInfo.java | 4 +-
.../parsing/impl/indexing/IndexerCache.java| 1 +
java/j2ee.persistence/licenseinfo.xml | 1 +
.../org-netbeans-modules-j2ee-persistence.sig | 2 +
.../j2ee/persistence/dd/PersistenceMetadata.java | 6 +-
.../j2ee/persistence/dd/PersistenceUtils.java | 12 ++-
.../j2ee/persistence/dd/common/JPAParseUtils.java | 13 +--
.../j2ee/persistence/dd/common/Persistence.java| 5 +
.../persistence/dd/common/PersistenceUnit.java | 107 +++--
.../persistence/dd/orm/model_3_0/package-info.java | 35 ---
.../persistence/dd/orm/model_3_1/package-info.java | 35 ---
.../dd/persistence/model_3_0/package-info.java | 35 +++
.../dd/persistence/model_3_1/package-info.java | 35 +++
.../persistence/dd/resources/persistence_3_0.mdd | 100 +++
.../persistence/editor/completion/PUCompletor.java | 15 ++-
.../j2ee/persistence/jpqleditor/JPQLExecutor.java | 3 +-
.../persistence/provider/DataNucleusProvider.java | 33 ---
.../j2ee/persistence/provider/DefaultProvider.java | 4 +-
.../persistence/provider/EclipseLinkProvider.java | 29 +++---
.../persistence/provider/HibernateProvider.java| 35 ---
.../j2ee/persistence/provider/Provider.java| 30 +-
.../j2ee/persistence/provider/ProviderUtil.java| 93 +-
.../EntityManagerGenerationStrategySupport.java| 6 +-
.../j2ee/persistence/ui/resources/PUResolver.xml | 24 -
.../j2ee/persistence/ui/resources/layer.xml| 1 +
.../persistence/ui/resources/persistence-3.0.xml | 3 +-
.../{persistence-3.0.xml => persistence-3.1.xml} | 7 +-
.../j2ee/persistence/unit/PUDataObject.java| 8 +-
.../persistence/unit/PersistenceCfgProperties.java | 46 -
.../unit/PersistenceToolBarMVElement.java | 14 ++-
.../persistence/unit/PersistenceUnitPanel.java | 24 -
.../j2ee/persistence/unit/PropertiesPanel.java | 9 +-
.../persistence/unit/PropertiesTableModel.java |
[netbeans] branch master updated: JS: Don't handle this as global value
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 2bce924a59 JS: Don't handle this as global value
new cc5516f28d Merge pull request #5800 from
matthiasblaesing/js_improvements6
2bce924a59 is described below
commit 2bce924a59eb4bf79cd7a54fdcd613e9876b0f05
Author: Matthias Bläsing
AuthorDate: Sat Apr 8 13:13:16 2023 +0200
JS: Don't handle this as global value
JS allows method calls for all functions, which in turn makes this
available in nearly all contexts. It is thus not sensible to report
this as an undeclared global variable.
Closes: #4568
Closes: #4213
---
.../editor/hints/GlobalIsNotDefined.java | 2 +-
.../test/unit/data/testfiles/hints/issueGH4213.js | 28 ++
.../hints/issueGH4213.js.testIssueGH4213.hints | 0
.../test/unit/data/testfiles/hints/issueGH4568.js | 24 +++
.../hints/issueGH4568.js.testIssueGH4568.hints | 0
.../editor/hint/JsGlobalIsNotDeclaredTest.java | 8 +++
.../modules/javascript2/model/api/ModelUtils.java | 10 +++-
.../data/testfiles/structure/bogusGlobalThis_01.js | 25 +++
.../structure/bogusGlobalThis_01.js.model | 14 +++
.../data/testfiles/structure/bogusGlobalThis_02.js | 25 +++
.../structure/bogusGlobalThis_02.js.model | 14 +++
.../modules/javascript2/model/ModelTest.java | 5
12 files changed, 153 insertions(+), 2 deletions(-)
diff --git
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/hints/GlobalIsNotDefined.java
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/hints/GlobalIsNotDefined.java
index fef301474c..96a9e80d15 100644
---
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/hints/GlobalIsNotDefined.java
+++
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/hints/GlobalIsNotDefined.java
@@ -60,7 +60,7 @@ import org.openide.util.NbBundle;
public class GlobalIsNotDefined extends JsAstRule {
private static final List KNOWN_GLOBAL_OBJECTS = Arrays.asList(
-"super", "$", "jQuery", //NOI18N
+"super", "$", "jQuery", "this", //NOI18N
Type.ARRAY, Type.OBJECT, Type.BOOLEAN, Type.NULL, Type.NUMBER,
Type.REGEXP, Type.STRING, Type.UNDEFINED, Type.UNRESOLVED);
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/hints/issueGH4213.js
b/webcommon/javascript2.editor/test/unit/data/testfiles/hints/issueGH4213.js
new file mode 100644
index 00..7fc5a1f1eb
--- /dev/null
+++ b/webcommon/javascript2.editor/test/unit/data/testfiles/hints/issueGH4213.js
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+class Test {
+ state = {
+ test: null
+ };
+
+ setCategory(url) {
+ this.state.test = {url};
+ }
+}
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/hints/issueGH4213.js.testIssueGH4213.hints
b/webcommon/javascript2.editor/test/unit/data/testfiles/hints/issueGH4213.js.testIssueGH4213.hints
new file mode 100644
index 00..e69de29bb2
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/hints/issueGH4568.js
b/webcommon/javascript2.editor/test/unit/data/testfiles/hints/issueGH4568.js
new file mode 100644
index 00..08db25dad6
--- /dev/null
+++ b/webcommon/javascript2.editor/test/unit/data/testfiles/hints/issueGH4568.js
@@ -0,0 +1,24 @@
+/*
+ * 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 Li
[netbeans] branch master updated: JS: Improve handling of export declarations (references and classes)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 fa4d33d1a1 JS: Improve handling of export declarations (references and
classes)
new 9c6309109e Merge pull request #5796 from
matthiasblaesing/js_improvements5
fa4d33d1a1 is described below
commit fa4d33d1a198d99b21205c22ba1e02bc3b66e47a
Author: Matthias Bläsing
AuthorDate: Fri Apr 7 22:37:54 2023 +0200
JS: Improve handling of export declarations (references and classes)
At least two issues are fixed by this:
- "export class XY" construct is not parsed correctly resulting in
a JS model for that class, that his missing methods
- "class XY {}; export {XY}" is not correctly parsed resulting missing
declaration handling for that member
Example that was not correctly parsed:
```
export class test {
method(param){
param;
}
};
// this shows in navigator / highlighting works
class test2{
method(param){
param;
}
}
// no highlighting, Go to declaration does not work
export {test2};
```
Closes: #5184
---
.../testfiles/markoccurences/issueGH5184_01.js | 23 +
...ssueGH5184_01.js.testIssueGH5184_01.occurrences | 2 ++
.../editor/navigation/GoToDeclarationTest.java | 5 -
.../editor/navigation/MarkOccurrenceTest.java | 6 +-
.../modules/javascript2/model/ModelVisitor.java| 24 --
.../data/testfiles/structure/issueGH5184_02.js | 23 +
.../testfiles/structure/issueGH5184_02.js.model| 11 ++
.../modules/javascript2/model/ModelTest.java | 4
.../src/com/oracle/js/parser/DumpingVisitor.java | 4 +++-
9 files changed, 97 insertions(+), 5 deletions(-)
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/issueGH5184_01.js
b/webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/issueGH5184_01.js
new file mode 100644
index 00..aca8114b1f
--- /dev/null
+++
b/webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/issueGH5184_01.js
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+class test2 {
+}
+
+export {test2};
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/issueGH5184_01.js.testIssueGH5184_01.occurrences
b/webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/issueGH5184_01.js.testIssueGH5184_01.occurrences
new file mode 100644
index 00..25bdaf9d3b
--- /dev/null
+++
b/webcommon/javascript2.editor/test/unit/data/testfiles/markoccurences/issueGH5184_01.js.testIssueGH5184_01.occurrences
@@ -0,0 +1,2 @@
+class |>MARK_OCCURRENCES:test2<| {
+export {|>MARK_OCCURRENCES:te^st2<|};
diff --git
a/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/navigation/GoToDeclarationTest.java
b/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/navigation/GoToDeclarationTest.java
index c196fceeb1..60557d7629 100644
---
a/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/navigation/GoToDeclarationTest.java
+++
b/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/navigation/GoToDeclarationTest.java
@@ -137,5 +137,8 @@ public class GoToDeclarationTest extends JsTestBase {
public void testImportedFile_03() throws Exception {
checkDeclaration("testfiles/ecmascript6/importExport/importFindDeclaration01.js",
"import { text as text3 } from \"l^ib/export02\";", "export02.js", 0);
}
-
+
+public void testIssueGH5184_01() throws Exception {
+checkDeclaration("testfiles/markoccurences/issueGH5184_01.js", "export
{te^st2};", "class ^test2 {");
+}
}
diff --git
a/webcommon
[netbeans] branch master updated (2dcd67ce60 -> be98db81e0)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 2dcd67ce60 Merge pull request #5801 from junichi11/php-gh-5330-fix-imports new 1d7d7a42a7 JS: Remove bogus assertion in Parser#verifyDestructuringBindingPattern new a455336bc9 JS: Prevent creation of cyclic model when parsing JS class like structure new be98db81e0 Merge pull request #5786 from matthiasblaesing/js_improvements4 The 8441 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: .../structure/objectNameMatchingNestedFunction.js | 23 ++ .../objectNameMatchingNestedFunction.js.structure | 2 ++ .../javascript2/editor/JsStructureScannerTest.java | 3 +++ .../modules/javascript2/model/JsObjectImpl.java| 11 ++- .../modules/javascript2/model/ModelVisitor.java| 9 - .../model/objectNameMatchingNestedFunction.js | 23 ++ .../objectNameMatchingNestedFunction.js.model | 16 +++ .../modules/javascript2/model/ModelTest.java | 4 .../src/com/oracle/js/parser/Parser.java | 1 - .../unit/src/com/oracle/js/parser/ParserTest.java | 9 + 10 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/structure/objectNameMatchingNestedFunction.js create mode 100644 webcommon/javascript2.editor/test/unit/data/testfiles/structure/objectNameMatchingNestedFunction.js.structure create mode 100644 webcommon/javascript2.model/test/unit/data/testfiles/model/objectNameMatchingNestedFunction.js create mode 100644 webcommon/javascript2.model/test/unit/data/testfiles/model/objectNameMatchingNestedFunction.js.model - 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 (7c9c4bcfb0 -> c7847c6703)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 7c9c4bcfb0 Merge pull request #5779 from troizet/fix_gh_5355 new d33be40b49 Improve JSX parsing (fragment syntax) new 1eb0cfb0d0 Improve JSX parsing (empty assignments with only comment as comment) new c7847c6703 Merge pull request #5765 from matthiasblaesing/js_improvements3 The 8431 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/javascript2/lexer/JsColoringLexer.java | 559 ++--- .../test/unit/data/testfiles/jsx/jsxComment.js | 1 + .../data/testfiles/jsx/jsxComment.js.tokens.txt| 28 ++ .../test/unit/data/testfiles/jsx/jsxFragment.js| 1 + .../data/testfiles/jsx/jsxFragment.js.tokens.txt | 11 + .../modules/javascript2/lexer/JsLexerJsxTest.java | 10 + .../javascript2.lexer/tools/JsColoringScanner.flex | 2 +- .../src/com/oracle/js/parser/Parser.java | 18 +- .../src/com/oracle/js/parser/DumpingVisitor.java | 14 +- .../unit/src/com/oracle/js/parser/ManualTest.java | 7 +- .../unit/src/com/oracle/js/parser/ParserTest.java | 8 + 11 files changed, 368 insertions(+), 291 deletions(-) create mode 100644 webcommon/javascript2.lexer/test/unit/data/testfiles/jsx/jsxComment.js create mode 100644 webcommon/javascript2.lexer/test/unit/data/testfiles/jsx/jsxComment.js.tokens.txt create mode 100644 webcommon/javascript2.lexer/test/unit/data/testfiles/jsx/jsxFragment.js create mode 100644 webcommon/javascript2.lexer/test/unit/data/testfiles/jsx/jsxFragment.js.tokens.txt - 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: html.validator: Remove dependency on log4j
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing 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 0a7374eb87 html.validator: Remove dependency on log4j new ca2b81262c Merge pull request #5716 from matthiasblaesing/html_validation_without_log4j 0a7374eb87 is described below commit 0a7374eb879d29f43daefa92733f3b8cb5247b11 Author: Matthias Bläsing AuthorDate: Fri Mar 24 23:19:57 2023 +0100 html.validator: Remove dependency on log4j This commit modifies the patched version of the html.validator not to rely on log4j anymore. There is no security gain estimated. This commit exists only to silence "security" teams, that have some strange interpretation of security. They assume, that you can deduce from the presence of a dependency/ library, whether or not there is a security problem. There is no evidence, that any of the CVEs against log4j 1 apply here. --- ide/html.validation/external/binaries-list | 3 +- .../external/log4j-1.2.15-license.txt | 209 -- ...tch => validator-20200626-0001-nb-patch1.patch} | 56 +- ...alidator-20200626-0002-Remove-log4j-usage.patch | 709 + ...txt => validator-20200626-patched2-license.txt} | 2 +- .../external/validator-howto-build.txt | 13 +- ide/html.validation/nbproject/project.properties | 5 +- ide/html.validation/nbproject/project.xml | 6 +- 8 files changed, 761 insertions(+), 242 deletions(-) diff --git a/ide/html.validation/external/binaries-list b/ide/html.validation/external/binaries-list index 853738ed15..5799256b51 100644 --- a/ide/html.validation/external/binaries-list +++ b/ide/html.validation/external/binaries-list @@ -16,8 +16,7 @@ # under the License. CC78B59E2539C78AF923C12939D8D1CDE44B5CC1 com.hp.hpl.jena:iri:0.8 483A61B688B13C62BB201A683D98A6688B5373B6 jing-0unknown.jar -F0A0D2E29ED910808C33135A3A5A51BBA6358F7B log4j:log4j:1.2.15 -2EF7FD1E7A714E04EF0881FB451CC4E85AD3D23F validator-20200626-patched.jar +4BC279C404401D55DF1811A08A43ACF8BC06FB92 validator-20200626-patched2.jar FACC6D84B0B0A650B1D44FED941E9ADD9F326862 isorelax-2004.jar FF0A7D89CE99F8D9EACDDC9D5D0B154462CA9935 com.shapesecurity:salvation:2.7.2 FCF9C70F53B9C0E7BC723F43558488BF58390B33 nu.validator:galimatias:0.1.3 diff --git a/ide/html.validation/external/log4j-1.2.15-license.txt b/ide/html.validation/external/log4j-1.2.15-license.txt deleted file mode 100644 index 2c6578a59d..00 --- a/ide/html.validation/external/log4j-1.2.15-license.txt +++ /dev/null @@ -1,209 +0,0 @@ -Name: Log4j -Description: Logging support library -Version: 1.2.15 -Origin: Apache Software Foundation -License: Apache-2.0 -URL: http://logging.apache.org/log4j/ - - - Apache License - Version 2.0, January 2004 -http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is b
[netbeans] branch master updated: Stabelize html lexer in broken cases
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 18c2e51daf Stabelize html lexer in broken cases
new 5fc81d9194 Merge pull request #5756 from
matthiasblaesing/stabilize_html_lexer
18c2e51daf is described below
commit 18c2e51daf88fe1cbc881aebbb601f938c8f3bea
Author: Matthias Bläsing
AuthorDate: Fri Mar 31 21:16:59 2023 +0200
Stabelize html lexer in broken cases
Faced with a structure like this:
">V />G>"
The html lexer hit an assertion as it tried to lex "a=q" as an
attribute value. The sequence " {
case ISP_TAG_X_ERROR:
if(isWS(actChar)) {
-lexerState = ISP_TAG_X;
+lexerState = tag == null ? INIT : ISP_TAG_X;
input.backup(1); //backup the WS
return token(HTMLTokenId.ERROR);
}
switch(actChar) {
case '/':
case '>':
-lexerState = ISP_TAG_X;
+lexerState = tag == null ? INIT : ISP_TAG_X;
input.backup(1); //lets reread the token again
return token(HTMLTokenId.ERROR);
}
@@ -822,7 +822,7 @@ public final class HtmlLexer implements Lexer {
lexerState = INIT;
return token(HTMLTokenId.TAG_CLOSE_SYMBOL);
default:
-lexerState = ISP_TAG_X;
+lexerState = tag == null ? INIT : ISP_TAG_X;
input.backup(1);
return token(HTMLTokenId.ERROR);
}
diff --git
a/ide/html.lexer/test/unit/src/org/netbeans/lib/html/lexer/HtmlLexerTest.java
b/ide/html.lexer/test/unit/src/org/netbeans/lib/html/lexer/HtmlLexerTest.java
index 23de053f36..22dca42754 100644
---
a/ide/html.lexer/test/unit/src/org/netbeans/lib/html/lexer/HtmlLexerTest.java
+++
b/ide/html.lexer/test/unit/src/org/netbeans/lib/html/lexer/HtmlLexerTest.java
@@ -375,52 +375,6 @@ public class HtmlLexerTest extends NbTestCase {
"=|OPERATOR", "'test'|VALUE", " |WS", "/>|TAG_CLOSE_SYMBOL");
}
-
-
//--
-
-public static void checkTokens(String text, String... descriptions) {
-TokenHierarchy th = TokenHierarchy.create(text,
HTMLTokenId.language());
-TokenSequence ts =
th.tokenSequence(HTMLTokenId.language());
-//System.out.println(ts);
-checkTokens(ts, descriptions);
-}
-
-public static void checkTokens(TokenSequence ts, String...
descriptions) {
-ts.moveStart();
-for(String descr : descriptions) {
-//parse description
-int slashIndex = descr.indexOf('|');
-assert slashIndex >= 0;
-
-String image = descr.substring(0, slashIndex);
-String id = descr.substring(slashIndex + 1);
-
-assertTrue(ts.moveNext());
-Token t = ts.token();
-assertNotNull(t);
-
-if(image.length() > 0) {
-assertEquals(image, t.text().toString());
-}
-
-if(id.length() > 0) {
-assertEquals(id, t.id().name());
-}
-}
-
-StringBuilder b = new StringBuilder();
-while(ts.moveNext()) {
-Token t = ts.token();
-b.append("\"");
-b.append(t.text());
-b.append('|');
-b.append(t.id().name());
-b.append("\"");
-b.append(", ");
-}
-assertTrue("There are some tokens left: " + b.toString(), b.length()
== 0);
-}
-
public void testScriptType_value() {
TokenHierarchy th = TokenHierarchy.create("plain", HTMLTokenId.language());
TokenSequence ts = th.tokenSequence();
@@ -473,5 +427,78 @@ public class HtmlLexerTest extends NbTestCase {
assertTrue("Couldn't find any SCRIPT token!", false);
}
-
+
+public void testBrokenCases() {
+// Two cases that were caught by randomness test and added here as
+// regression check
+assertLexesWithoutAssertion("u >z//<=>=>\n"
++ "= \n"
++ ">>>/>>//w>\n"
++ " yl>be<<=k F > Y <<<\n"
++ " >Jj/>k >> =
[netbeans] branch master updated (e1b594034b -> d371705b68)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from e1b594034b Merge pull request #5758 from
junichi11/php-gh-4609-psr12-between-use-types
new cf60cac198 JS: Ensure private fields are reported for classes
new babd4e752b JS: Fix private/static modifiers from structure scanner
new d371705b68 Merge pull request #5677 from
matthiasblaesing/js_improvements1
The 8382 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:
.../javascript2/editor/JsStructureScanner.java | 2 +-
.../asyncFunctions/asyncFunctions3.js.ast.xml | 1 +
.../unit/data/testfiles/structure/issueGH4371.js | 42 ++
.../testfiles/structure/issueGH4371.js.structure | 13 +++
.../javascript2/editor/JsStructureScannerTest.java | 4 +++
.../modules/javascript2/model/ModelVisitor.java| 3 ++
webcommon/libs.nashorn/external/binaries-list | 2 +-
...-license.txt => graaljs-parser-1.2-license.txt} | 2 +-
.../libs.nashorn/nbproject/project.properties | 2 +-
webcommon/libs.nashorn/nbproject/project.xml | 4 +--
10 files changed, 69 insertions(+), 6 deletions(-)
create mode 100644
webcommon/javascript2.editor/test/unit/data/testfiles/structure/issueGH4371.js
create mode 100644
webcommon/javascript2.editor/test/unit/data/testfiles/structure/issueGH4371.js.structure
rename webcommon/libs.nashorn/external/{graaljs-parser-1.1-license.txt =>
graaljs-parser-1.2-license.txt} (99%)
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Make JDK URL calculation JDK 8 compatible
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 785f5e0e27 Make JDK URL calculation JDK 8 compatible
new 3414856d5b Merge pull request #5748 from matthiasblaesing/fix_jdk8
785f5e0e27 is described below
commit 785f5e0e27404b25b0f859a46ba2f0222d689e0f
Author: Matthias Bläsing
AuthorDate: Thu Mar 30 22:22:27 2023 +0200
Make JDK URL calculation JDK 8 compatible
---
.../platformdefinition/J2SEPlatformDefaultJavadocImpl.java | 12 ++--
1 file changed, 6 insertions(+), 6 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..30369b12da 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
@@ -66,12 +66,12 @@ public final class J2SEPlatformDefaultJavadocImpl
implements J2SEPlatformDefault
LocalDate now = LocalDate.now();
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) -> {
-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
+int jdk = 9;
+for (LocalDate t = jdk9; t.isBefore(now); t = t.plusMonths(6)) {
+OFFICIAL_JAVADOC.put(String.valueOf(jdk),
"https://docs.oracle.com/javase/; + jdk + "/docs/api/"); // NOI18N
+jdk++;
+}
+OFFICIAL_JAVADOC.put(String.valueOf(jdk),
"https://download.java.net/java/early_access/jdk; + jdk + "/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] branch master updated: Maven indexing: Retain download index setting even if index setting is disabled
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 241a4180d5 Maven indexing: Retain download index setting even if index
setting is disabled
new 58ea71d87e Merge pull request #5673 from
matthiasblaesing/maven_index_settings
241a4180d5 is described below
commit 241a4180d5ec494d83399fb8c722ff9acbdf744c
Author: Matthias Bläsing
AuthorDate: Fri Mar 17 17:43:45 2023 +0100
Maven indexing: Retain download index setting even if index setting is
disabled
When the maven general indexing is disabled, the setting for the index
download is lost and forced to be false. Instead of loosing the value
a new preferences getter is introduced, that calculates the effective
value based on the two components:
- general indexing
- download index
Only if both settings are true, the effective value will be true.
---
.../modules/maven/indexer/NexusRepositoryIndexerImpl.java | 4 ++--
.../modules/maven/indexer/api/RepositoryPreferences.java | 11 +++
.../src/org/netbeans/modules/maven/ProjectOpenedHookImpl.java | 2 +-
.../src/org/netbeans/modules/maven/options/SettingsPanel.java | 11 ---
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
index 8363a3142a..f0e2989086 100644
---
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
+++
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
@@ -653,7 +653,7 @@ public class NexusRepositoryIndexerImpl implements
RepositoryIndexerImplementati
//spawn the indexing into a separate thread..
private boolean spawnIndexLoadedRepo(final RepositoryInfo repo) {
-if (!RepositoryPreferences.isIndexDownloadEnabled() &&
repo.isRemoteDownloadable()) {
+if (!RepositoryPreferences.isIndexDownloadEnabledEffective() &&
repo.isRemoteDownloadable()) {
LOGGER.log(Level.FINE, "Skipping remote index request for {0}",
repo);
return false;
}
@@ -678,7 +678,7 @@ public class NexusRepositoryIndexerImpl implements
RepositoryIndexerImplementati
@Override
public void indexRepo(final RepositoryInfo repo) {
-if (!RepositoryPreferences.isIndexDownloadEnabled() &&
repo.isRemoteDownloadable()) {
+if (!RepositoryPreferences.isIndexDownloadEnabledEffective() &&
repo.isRemoteDownloadable()) {
LOGGER.log(Level.FINE, "Skipping remote index request for {0}",
repo);
return;
}
diff --git
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
index 08878229fa..7c1b79ab0a 100644
---
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
+++
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
@@ -390,6 +390,17 @@ public final class RepositoryPreferences {
return getPreferences().getBoolean(PROP_DOWNLOAD_INDEX,
getDefaultDownloadIndexEnabled());
}
+/**
+ * Downloading the remote index should only happen if indexing in general
+ * and downloading in particular are enabled.
+ *
+ * @since 2.60
+ * @return true if indexing and downloading are both enabled.
+ */
+public static boolean isIndexDownloadEnabledEffective() {
+return isIndexRepositories() && isIndexDownloadEnabled();
+}
+
@NbBundle.Messages({
"# true or false:",
"DEFAULT_DOWNLOAD_INDEX=true"
diff --git
a/java/maven/src/org/netbeans/modules/maven/ProjectOpenedHookImpl.java
b/java/maven/src/org/netbeans/modules/maven/ProjectOpenedHookImpl.java
index 8fae98a1c3..14f716d712 100644
--- a/java/maven/src/org/netbeans/modules/maven/ProjectOpenedHookImpl.java
+++ b/java/maven/src/org/netbeans/modules/maven/ProjectOpenedHookImpl.java
@@ -203,7 +203,7 @@ public class ProjectOpenedHookImpl extends
ProjectOpenedHook {
LOGGER.log(Level.FINER, "Index once a Week
:{0}", ri.getId());//NOI18N
run = true;
}
-if (run && ri.isRemoteDownloadable() &&
RepositoryPreferences.isIndexDownloadEnabled()) {
+if (run && ri.isRemoteDownloadable()) {
RepositoryIndexer.indexRepo(ri);
}
[netbeans] branch master updated (9114b1069e -> a89f7f856a)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 9114b1069e Avoid ConcurrentMod exception, tolerate broken project
dependencies (#5660)
new e4c2f2641a Fix html.lexer and reenable html.lexer and html.editor.lib
tests in CI/CD
new ad48f8fa64 Normalize html index (store multiple values as multiple
entries, instead of joined value)
new 155fd6798f Fix character entity completion (|mp; was completed to
)
new 34bb2ccad3 Support CSS special characters (colons) in class names
new be093c3486 Ensure indention is handled in a predictable order
new 6053c24962 Improve CSS escape/unescape routines and enhance/add
unittests to validate results
new a89f7f856a Merge pull request #5641 from
matthiasblaesing/css_with_escape3
The 8284 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 | 7 +-
.../modules/css/editor/csl/CssAnalyser.java| 2 +-
.../modules/css/editor/csl/CssCompletion.java |37 +-
.../modules/css/editor/csl/CssNodeElement.java | 2 +-
.../editor/module/main/CssRuleStructureItem.java |10 +-
.../editor/module/main/DefaultCssEditorModule.java |20 +-
.../css/editor/module/spi/CssCompletionItem.java |62 +-
.../modules/css/indexing/CssFileModel.java | 6 +-
.../modules/css/refactoring/Bundle.properties | 6 +-
.../CssActionsImplementationProvider.java | 224 +-
.../modules/css/refactoring/CssElementContext.java | 217 -
.../refactoring/CssRefactoringPluginFactory.java | 5 +-
.../refactoring/CssRenameRefactoringPlugin.java| 159 +-
.../css/refactoring/CssRenameRefactoringUI.java|25 +-
.../css/refactoring/CssWhereUsedQueryPlugin.java |54 +-
.../modules/css/refactoring/WhereUsedElement.java | 8 +-
.../modules/css/refactoring/WhereUsedUI.java |16 +-
.../{ => api}/CssRefactoringExtraInfo.java | 6 +-
.../CssRefactoringInfo.java} |36 +-
.../unit/data/testProject/public_html/test.html| 1 +
.../testfiles/index/identifiers-with-colon.css |11 +
.../index/identifiers-with-colon.css.indexed |10 +
.../netbeans/modules/css/editor/Css3UtilsTest.java | 6 +-
.../editor/module/spi/CssCompletionItemTest.java |40 +
.../modules/css/indexing/CssIndexerTest.java | 4 +
.../modules/css/indexing/api/CssIndexTest.java | 2 +-
.../src/org/netbeans/modules/css/lib/api/Node.java | 5 +-
.../org/netbeans/modules/css/lib/api/NodeUtil.java |41 +
.../netbeans/modules/css/lib/api/NodeUtilTest.java |18 +-
.../modules/editor/indent/TaskHandler.java |25 +-
.../test/unit/data/testfiles/huge.html | 46216 +++
ide/html.editor/licenseinfo.xml| 1 +
ide/html.editor/nbproject/project.xml | 2 +-
.../modules/html/editor/CssPreferences.java|78 +
.../editor/api/completion/HtmlCompletionItem.java |59 +-
.../editor/completion/HtmlCompletionQuery.java |72 +-
.../editor/embedding/CssEmbeddingProvider.java | 7 +-
.../html/editor/embedding/CssHtmlTranslator.java |86 +-
.../html/editor/gsf/HtmlDeclarationFinder.java | 103 +-
.../editor/indexing/HtmlCssIndexContributor.java | 148 +
.../html/editor/indexing/HtmlFileModel.java|89 +-
.../modules/html/editor/indexing/HtmlIndexer.java |32 +-
.../html/editor/refactoring/Bundle.properties |27 +-
.../refactoring/CssRenameRefactoringPlugin.java| 228 +
.../refactoring/CssRenameRefactoringUI.java|29 +-
.../refactoring/CssWhereUsedQueryPlugin.java | 201 +
.../refactoring/ExtractInlinedStylePanel.form | 2 +-
.../refactoring/ExtractInlinedStylePanel.java | 2 +-
.../HtmlActionsImplementationProvider.java | 145 +-
.../refactoring/HtmlRefactoringPluginFactory.java |10 +-
.../html/editor}/refactoring/RenamePanel.form | 0
.../html/editor/refactoring/RenamePanel.java | 230 +
.../html/editor}/refactoring/WhereUsedElement.java |17 +-
.../html/editor}/refactoring/WhereUsedPanel.form | 0
.../html/editor/refactoring/WhereUsedPanel.java| 118 +
.../html/editor}/refactoring/WhereUsedUI.java |20 +-
.../modules/html/editor/resources}/rule.png| Bin
.../unit/data/testfiles/embedding/issue215267.html | 9 -
.../testfiles/embedding/issue215267.html.virtual | 2 -
.../data/testfiles/embedding/test1.html.virtual| 5 -
.../unit/data/testfiles/simple07.ht
[netbeans] branch master updated (232ad487ab -> c3d96a0a72)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 232ad487ab Merge pull request #5648 from troizet/return_statement_filled_value_hint new c6f3f4b635 Image: Ensure antialiasing is active for navigator window new 6947148ac7 Image: Improve synchronisation between mouse movement and image movement new 3992433d40 Image: Fix NetBeans and javac warnings new c3d96a0a72 Merge pull request #5661 from matthiasblaesing/improve_image_display The 8262 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/image/CustomZoomAction.java | 45 ++- .../netbeans/modules/image/ImageDataLoader.java| 24 +- .../modules/image/ImageDataLoaderBeanInfo.java | 3 +- .../netbeans/modules/image/ImageDataObject.java| 118 +++--- .../netbeans/modules/image/ImageOpenSupport.java | 51 ++- .../netbeans/modules/image/ImagePrintSupport.java | 51 +-- .../org/netbeans/modules/image/ImageViewer.java| 404 ++--- .../org/netbeans/modules/image/NBImageIcon.java| 18 +- .../org/netbeans/modules/image/ZoomInAction.java | 5 + .../org/netbeans/modules/image/ZoomOutAction.java | 13 +- .../modules/image/action/ExternalEditAction.java | 51 ++- .../image/navigation/ImageNavigatorPanel.java | 77 ++-- .../image/navigation/ImagePreviewPanel.java| 4 +- 13 files changed, 411 insertions(+), 453 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: Remove unnessary build options from project definitions
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 d4eb76dfd2 Remove unnessary build options from project definitions
new c6cabb6d95 Merge pull request #5652 from
matthiasblaesing/simplify-build
d4eb76dfd2 is described below
commit d4eb76dfd2c69740acf1dbea77a79c18ca817574
Author: Matthias Bläsing
AuthorDate: Sat Mar 11 16:18:34 2023 +0100
Remove unnessary build options from project definitions
This removes the last remaining "-Xmx" overrides from the
project.properties. The option does not seem to be used and the
property definition overrides a previous one.
In addition the "build.compiler=extJavac" option is removed as the build
run correctly without this.
---
ide/xml.axi/nbproject/project.properties | 2 --
ide/xml.xdm/nbproject/project.properties | 2 --
php/php.editor/nbproject/project.properties | 2 --
webcommon/javascript2.editor/nbproject/project.properties | 2 --
4 files changed, 8 deletions(-)
diff --git a/ide/xml.axi/nbproject/project.properties
b/ide/xml.axi/nbproject/project.properties
index 0111f56410..47550a6be8 100644
--- a/ide/xml.axi/nbproject/project.properties
+++ b/ide/xml.axi/nbproject/project.properties
@@ -20,8 +20,6 @@
is.autoload=true
javac.source=1.8
javadoc.arch=${basedir}/arch.xml
-test.unit.jvmargs=-Xmx128m
-xtest.jvm.args=-Xmx128m
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/xml.xdm/nbproject/project.properties
b/ide/xml.xdm/nbproject/project.properties
index 147a265693..0c8fd34b7a 100644
--- a/ide/xml.xdm/nbproject/project.properties
+++ b/ide/xml.xdm/nbproject/project.properties
@@ -21,7 +21,5 @@ is.autoload=true
javac.source=1.8
javadoc.arch=${basedir}/arch.xml
spec.version.base=1.54.0
-test.unit.jvmargs=-Xmx128m
-xtest.jvm.args=-Xmx128m
test.config.stableBTD.includes=**/*Test.class
diff --git a/php/php.editor/nbproject/project.properties
b/php/php.editor/nbproject/project.properties
index e3bdf01f85..a5f392a9b5 100644
--- a/php/php.editor/nbproject/project.properties
+++ b/php/php.editor/nbproject/project.properties
@@ -16,9 +16,7 @@
# under the License.
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..42b6fe2a2e 100644
--- a/webcommon/javascript2.editor/nbproject/project.properties
+++ b/webcommon/javascript2.editor/nbproject/project.properties
@@ -17,8 +17,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 master updated (ac1355bd69 -> eff61ac640)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from ac1355bd69 Merge pull request #5530 from matthiasblaesing/thread_control new 57bb070662 Remove usage of Thread#suspend and Thread#resume from INSANE new 492479216b Remove unmaintained and unreferenced qa-functional tests in extbrowser new db16282f70 Replace Thread#stop with Thread#interrupt in EditorFindSupportTest new eff61ac640 Merge pull request #5532 from matthiasblaesing/thread_control2 The 8162 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/insane/scanner/ScannerUtils.java | 31 +- .../editor/search/EditorFindSupportTest.java | 12 +- .../web/extbrowser/execution/ExecuteCLBrowser.java | 222 - .../execution/ExecuteCLFullPathBrowser.java| 227 - .../execution/ExecuteExternalUnixBrowser.java | 186 --- .../extbrowser/execution/ExecuteSwingBrowser.java | 183 --- .../web/extbrowser/settings/BrowserRegistry.java | 355 - .../extbrowser/settings/JspAndServletSettings.java | 120 --- .../web/extbrowser/settings/SystemSettings.java| 119 --- .../test/gui/web/extbrowser/using/Using.java | 267 .../netbeans/test/gui/web/util/BrowserUtils.java | 310 -- .../test/gui/web/util/HttpRequestWaitable.java | 120 --- .../gui/web/util/JSPServletResponseWaitable.java | 122 --- 13 files changed, 7 insertions(+), 2267 deletions(-) delete mode 100644 ide/extbrowser/test/ExtBrowser/qa-functional/src/org/netbeans/test/gui/web/extbrowser/execution/ExecuteCLBrowser.java delete mode 100644 ide/extbrowser/test/ExtBrowser/qa-functional/src/org/netbeans/test/gui/web/extbrowser/execution/ExecuteCLFullPathBrowser.java delete mode 100644 ide/extbrowser/test/ExtBrowser/qa-functional/src/org/netbeans/test/gui/web/extbrowser/execution/ExecuteExternalUnixBrowser.java delete mode 100644 ide/extbrowser/test/ExtBrowser/qa-functional/src/org/netbeans/test/gui/web/extbrowser/execution/ExecuteSwingBrowser.java delete mode 100644 ide/extbrowser/test/ExtBrowser/qa-functional/src/org/netbeans/test/gui/web/extbrowser/settings/BrowserRegistry.java delete mode 100644 ide/extbrowser/test/ExtBrowser/qa-functional/src/org/netbeans/test/gui/web/extbrowser/settings/JspAndServletSettings.java delete mode 100644 ide/extbrowser/test/ExtBrowser/qa-functional/src/org/netbeans/test/gui/web/extbrowser/settings/SystemSettings.java delete mode 100644 ide/extbrowser/test/ExtBrowser/qa-functional/src/org/netbeans/test/gui/web/extbrowser/using/Using.java delete mode 100644 ide/extbrowser/test/ExtBrowser/qa-functional/src/org/netbeans/test/gui/web/util/BrowserUtils.java delete mode 100644 ide/extbrowser/test/ExtBrowser/qa-functional/src/org/netbeans/test/gui/web/util/HttpRequestWaitable.java delete mode 100644 ide/extbrowser/test/ExtBrowser/qa-functional/src/org/netbeans/test/gui/web/util/JSPServletResponseWaitable.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 (7e6f712242 -> ac1355bd69)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 7e6f712242 Merge pull request #5583 from AanshSavla/typoCorrection
new 1423441805 Update Http Server to Tomcat Embedded 9 and remove
Thread#stop usage
new 3752e3e75c Establish access control for all requests to the built-in
http server
new 2bfe11c332 General cleanup in httpserver module
new 104ed0f146 Register node in Services tab to make embeddable httpserver
stoppable
new 5da55980b9 Fix issue loading resources with special characters in the
URL part not controlled by netbeans
new b0e1c9c4c3 Enable unit tests for httpserver and remove unmaintained
and disfunctional qa-functional test
new ac1355bd69 Merge pull request #5530 from
matthiasblaesing/thread_control
The 8158 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 |3 +
.../modules/web/monitor/server/NotifyUtil.java | 66 +-
.../modules/web/monitor/client/PutTransaction.java |5 +-
ide/httpserver/external/binaries-list |4 +-
...t => tomcat-annotations-api-9.0.71-license.txt} |6 +-
.../tomcat-annotations-api-9.0.71-notice.txt |2 +
.../external/tomcat-embed-core-9.0.71-license.txt | 569 ++
.../external/tomcat-embed-core-9.0.71-notice.txt | 28 +
.../httpserver/layer.xml => licenseinfo.xml} | 15 +-
ide/httpserver/manifest.mf |2 +-
ide/httpserver/nbproject/project.properties|4 +-
ide/httpserver/nbproject/project.xml | 15 +-
.../{NbBaseServlet.java => AccessFilter.java} | 65 +-
.../netbeans/modules/httpserver/Bundle.properties | 29 +-
.../modules/httpserver/GrantAccessEvent.java | 57 +-
.../modules/httpserver/GrantAccessListener.java| 24 +-
.../modules/httpserver/GrantAccessPanel.java |7 +-
.../httpserver/HostPropertyCustomEditor.form |2 +-
.../httpserver/HostPropertyCustomEditor.java | 15 +-
.../modules/httpserver/HostPropertyEditor.java |6 +-
.../modules/httpserver/HttpServerModule.java | 406 +++--
.../modules/httpserver/HttpServerSettings.java | 177 +-
.../modules/httpserver/HttpServerURLMapper.java| 82 +-
.../modules/httpserver/NbLoaderInterceptor.java| 60 -
.../modules/httpserver/NbServletsInterceptor.java | 75 -
.../modules/httpserver/NotFoundServlet.java| 44 -
.../modules/httpserver/ServerControlNode.java | 113 ++
.../modules/httpserver/WrapperServlet.java | 96 +-
.../modules/httpserver/httpserver-active.png | Bin 0 -> 828 bytes
.../modules/httpserver/httpserver-active.svg | 103 ++
.../org/netbeans/modules/httpserver/httpserver.png | Bin 0 -> 517 bytes
.../org/netbeans/modules/httpserver/httpserver.svg | 103 ++
.../src/org/netbeans/modules/httpserver/layer.xml | 15 +-
.../org/netbeans/test/gui/httpserver/Module.java | 1815
.../src/org/netbeans/test/gui/httpserver/test.txt |5 -
.../netbeans/modules/httpserver/URLMapperTest.java | 33 +-
ide/servletapi/external/binaries-list |2 +-
.../external/jakarta.servlet-api-4.0.4-license.txt | 93 +
ide/servletapi/external/servlet-2.2-license.txt| 60 -
.../nbproject/org-netbeans-modules-servletapi.sig | 498 +-
ide/servletapi/nbproject/project.properties|2 +-
ide/servletapi/nbproject/project.xml |4 +-
.../netbeans/modules/servletapi/Bundle.properties |6 +-
.../org/netbeans/nbbuild/extlibs/ignored-overlaps |3 +
nbbuild/licenses/Apache-2.0-tomcat | 562 ++
45 files changed, 2614 insertions(+), 2667 deletions(-)
rename ide/httpserver/external/{webserver-3.2.4-license.txt =>
tomcat-annotations-api-9.0.71-license.txt} (99%)
create mode 100644
ide/httpserver/external/tomcat-annotations-api-9.0.71-notice.txt
create mode 100644 ide/httpserver/external/tomcat-embed-core-9.0.71-license.txt
create mode 100644 ide/httpserver/external/tomcat-embed-core-9.0.71-notice.txt
copy ide/httpserver/{src/org/netbeans/modules/httpserver/layer.xml =>
licenseinfo.xml} (74%)
rename ide/httpserver/src/org/netbeans/modules/httpserver/{NbBaseServlet.java
=> AccessFilter.java} (54%)
delete mode 100644
ide/httpserver/src/org/netbeans/modules/httpserver/NbLoaderInterceptor.java
delete mode 100644
ide/httpserver/src/org/netbeans/modules/httpserver/NbServletsInterceptor.java
delete mode 100644
ide/httpserver/src/org/netbeans/modules/httpserver/NotFoundServlet.java
create mode 100644
ide/ht
[netbeans] branch master updated: Memleak fixed with closing streams
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 525f5f5f14 Memleak fixed with closing streams
new 80ee045a8f Merge pull request #5469 from tbw777/try1
525f5f5f14 is described below
commit 525f5f5f147493f1e223a9becb5202b596fb4b65
Author: Andrey Bruykhov
AuthorDate: Sat Feb 11 13:25:19 2023 +0300
Memleak fixed with closing streams
Some resources was in uncloused condition.
---
.../org/netbeans/modules/gradle/loaders/GradleDaemon.java | 6 --
.../modules/java/openjdk/jtreg/ActionProviderImpl.java| 6 +++---
.../netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java | 8 +---
.../nbbuild/extlibs/ExclusionsFromLicenseInfo.java| 14 ++
.../netbeans/nbbuild/extlibs/ReportFromLicenseinfo.java | 15 +++
.../src/org/netbeans/modules/autoupdate/ui/Utilities.java | 6 --
6 files changed, 37 insertions(+), 18 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/loaders/GradleDaemon.java
b/extide/gradle/src/org/netbeans/modules/gradle/loaders/GradleDaemon.java
index 152e18b2e3..5f2fab8b62 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/loaders/GradleDaemon.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/loaders/GradleDaemon.java
@@ -30,6 +30,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
import org.gradle.tooling.BuildAction;
import org.gradle.tooling.BuildActionExecuter;
import org.gradle.tooling.BuildController;
@@ -83,8 +85,8 @@ public final class GradleDaemon {
synchronized (initScriptReady) {
if (!initScriptReady.get()) {
File initTemplate =
InstalledFileLocator.getDefault().locate(INIT_SCRIPT_NAME,
NbGradleProject.CODENAME_BASE, false);
-try {
-List script =
Files.lines(initTemplate.toPath()).map(line -> line.replace(PROP_TOOLING_JAR,
TOOLING_JAR)).collect(Collectors.toList());
+try (Stream lines =
Files.lines(initTemplate.toPath())) {
+List script = lines.map(line ->
line.replace(PROP_TOOLING_JAR, TOOLING_JAR)).collect(Collectors.toList());
Files.write(initScript.toPath(), script);
initScriptReady.set(true);
} catch(IOException ex) {
diff --git
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ActionProviderImpl.java
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ActionProviderImpl.java
index e80d2eae7d..4c7e418afd 100644
---
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ActionProviderImpl.java
+++
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ActionProviderImpl.java
@@ -45,6 +45,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.stream.Stream;
import javax.swing.AbstractAction;
import javax.swing.SwingUtilities;
@@ -628,9 +629,8 @@ public class ActionProviderImpl implements ActionProvider {
File buildDir = BuildUtils.getBuildTargetDir(file);
File spec = new File(buildDir, "spec.gmk");
if (spec.canRead()) {
-try {
-String jtHome = Files.lines(spec.toPath())
- .filter(l -> l.startsWith(JT_HOME_KEY))
+try (Stream lines = Files.lines(spec.toPath())) {
+String jtHome = lines.filter(l -> l.startsWith(JT_HOME_KEY))
.findAny()
.orElse(JT_HOME_KEY)
.substring(JT_HOME_KEY.length());
diff --git
a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java
b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java
index 30b20bfb61..dad1b2bb27 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java
@@ -26,10 +26,13 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.math.BigInteger;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.Map;
+import java.util.stream.Stream;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
@@ -94,10 +97,9 @@ public class CheckEmbeddedBinaries extends Task {
throw new BuildException("Could not open " + mani
[netbeans] branch master updated: Adding system path into the classpath info when parsing custom conditions in a hint file. Avoid failures while constructing custom scopes.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 99f342e4ab Adding system path into the classpath info when parsing
custom conditions in a hint file. Avoid failures while constructing custom
scopes.
new 5197f07668 Merge pull request #5296 from
jlahoda/correct-declarative-hints-boot
99f342e4ab is described below
commit 99f342e4abfeaa3c6ba4c512f36b473705d48358
Author: Jan Lahoda
AuthorDate: Sun Jan 15 18:08:40 2023 +0100
Adding system path into the classpath info when parsing custom conditions
in a hint file. Avoid failures while constructing custom scopes.
---
.../modules/java/hints/declarative/DeclarativeHintsParser.java | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git
a/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/DeclarativeHintsParser.java
b/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/DeclarativeHintsParser.java
index 21cea1f9f3..d2826b20f9 100644
---
a/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/DeclarativeHintsParser.java
+++
b/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/DeclarativeHintsParser.java
@@ -464,8 +464,14 @@ public class DeclarativeHintsParser {
}
}
if (result == null) {
-result =
ClasspathInfo.create(ClassPathSupport.createProxyClassPath(
-javacPath,
cpInfo.getClassPath(ClasspathInfo.PathKind.BOOT)), ClassPath.EMPTY,
ClassPath.EMPTY);
+ClassPath bootCP =
+ClassPathSupport.createProxyClassPath(javacPath,
+
cpInfo.getClassPath(ClasspathInfo.PathKind.BOOT)
+ );
+ClassPath systemCP =
cpInfo.getClassPath(ClasspathInfo.PathKind.MODULE_BOOT);
+result = new ClasspathInfo.Builder(bootCP)
+ .setModuleBootPath(systemCP)
+ .build();
cache = new WeakReference<>(new Holder(result, cpInfo));
}
cpInfo = result;
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: [NETBEANS-4123] Implemented handling large strings for Java 9+
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 b5a597f11d [NETBEANS-4123] Implemented handling large strings for Java
9+
new d06fcf1f3a Merge pull request #5299 from SirIntellegence/NETBEANS-4123
b5a597f11d is described below
commit b5a597f11d3cc6b084138268bd572115ecda10f5
Author: Austin Stephens
AuthorDate: Mon Jan 16 11:28:17 2023 -0700
[NETBEANS-4123] Implemented handling large strings for Java 9+
In the debugger (+7 squashed commits)
Squashed commits:
[5e450181470f] [NETBEANS-4123] Lifted exceptions from
ShortenedStrings.isLittleEndian
Waiting for this change to be reviewed before squishing
[fc97d860fd01] [NETBEANS-4123] Checkpoint before extracting exceptions...
[e6cedcda8c5d] [NETBEANS-4123] Moved sync blocks around as per
@matthiasblaesing
[1b1da080614d] [NETBEANS-4123] Now caching whether or not a VM is little
endian
Check is now deferred to when it is needed instead of right away.
[4f52c498989c] [NETBEANS-4123] Finished implementing the handling of long
strings
Renamed 'compressed' things to 'compact'
Tested with a long UTF16 string on little endian. It detects the byte order
properly
[e8d001f2fd5e] [NETBEANS-4123] Apply suggestions from code review
Will apply other changes and testing in a bit since you can't do those in
GitHub
Co-authored-by: Matthias Bläsing
[2caef567d9a3] [NETBEANS-4123] Initial implementation of handling large
strings
in Java 9+ where the String class uses a byte[] instead of a char[]
---
.../jpda/models/AbstractObjectVariable.java| 10 +-
.../debugger/jpda/models/AbstractVariable.java | 10 +-
.../debugger/jpda/models/ShortenedStrings.java | 206 +++--
.../jpda/models/VariableMirrorTranslator.java | 6 +-
4 files changed, 210 insertions(+), 22 deletions(-)
diff --git
a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/AbstractObjectVariable.java
b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/AbstractObjectVariable.java
index 2efa14cb17..360d5d7706 100644
---
a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/AbstractObjectVariable.java
+++
b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/AbstractObjectVariable.java
@@ -22,8 +22,12 @@ package org.netbeans.modules.debugger.jpda.models;
import com.sun.jdi.ArrayReference;
import com.sun.jdi.ArrayType;
import com.sun.jdi.CharValue;
+import com.sun.jdi.ClassNotLoadedException;
import com.sun.jdi.ClassObjectReference;
import com.sun.jdi.ClassType;
+import com.sun.jdi.IncompatibleThreadStateException;
+import com.sun.jdi.InvalidTypeException;
+import com.sun.jdi.InvocationException;
import com.sun.jdi.Method;
import com.sun.jdi.ObjectReference;
import com.sun.jdi.PrimitiveValue;
@@ -519,14 +523,14 @@ public class AbstractObjectVariable extends
AbstractVariable implements ObjectVa
str = "\"" + str + "\""; // NOI18N
}
return str;
-} catch (InternalExceptionWrapper ex) {
+} catch (InternalExceptionWrapper | ClassNotPreparedExceptionWrapper |
+ClassNotLoadedException | IncompatibleThreadStateException |
+InvalidTypeException | InvocationException ex) {
return ex.getLocalizedMessage();
} catch (VMDisconnectedExceptionWrapper ex) {
return NbBundle.getMessage(AbstractVariable.class,
"MSG_Disconnected");
} catch (ObjectCollectedExceptionWrapper ocex) {
return NbBundle.getMessage(AbstractVariable.class,
"MSG_ObjCollected");
-} catch (ClassNotPreparedExceptionWrapper cnpex) {
-return cnpex.getLocalizedMessage();
}
}
diff --git
a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/AbstractVariable.java
b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/AbstractVariable.java
index 1160b81f08..56f31b16e3 100644
---
a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/AbstractVariable.java
+++
b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/AbstractVariable.java
@@ -152,11 +152,11 @@ public class AbstractVariable implements JDIVariable,
Customizer, Cloneable {
"(length=" + ArrayReferenceWrapper.length((ArrayReference)
v) + ")";
}
return "#" + ObjectReferenceWrapper.uniqueID((ObjectReference) v);
-} catch (InternalExceptionWrapper iex) {
-return "";
-} catch (ObjectCollectedExceptionWrapper oex) {
-return "";
-} catch (VMDisconnected
[netbeans] branch master updated (379a0ab42b -> 795e1d85e7)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 379a0ab42b Merge pull request #5431 from matthiasblaesing/github-5402 new ee9ec7ad67 Support recursive CSS property definitions new ecb6ac950a Fix warnings in css.lib module new 0788e1ef3c CSS custom properties can hold basicly hold any content new a0a222a604 Support CSS :has pseudo-class new d4d8c15310 Cache ElementImpl constructor and silence warning new 795e1d85e7 Merge pull request #5432 from matthiasblaesing/css_improvements The 8091 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: ide/css.editor/nbproject/project.xml | 4 +- .../main/properties/default_module.properties |14 +- .../css/editor/module/main/ColorsModuleTest.java | 4 +- .../css/editor/module/main/CssModuleTestBase.java |45 +- ide/css.lib/manifest.mf| 4 +- .../nbproject/org-netbeans-modules-css-lib.sig |23 +- .../modules/css/lib/AbstractParseTreeNode.java | 5 +- .../src/org/netbeans/modules/css/lib/Css3.g|22 +- .../org/netbeans/modules/css/lib/Css3Lexer.java| 2922 +-- .../org/netbeans/modules/css/lib/Css3Parser.java | 23916 ++- .../modules/css/lib/NbParseTreeBuilder.java|36 +- .../modules/css/lib/api/CssParserResult.java | 6 +- .../org/netbeans/modules/css/lib/api/NodeType.java | 8 + .../org/netbeans/modules/css/lib/api/NodeUtil.java | 2 +- .../netbeans/modules/css/lib/api/NodeVisitor.java | 2 +- .../css/lib/api/properties/GrammarElement.java |13 +- .../lib/api/properties/GrammarElementVisitor.java |25 +- .../lib/api/properties/GroupGrammarElement.java|30 +- .../modules/css/lib/api/properties/Properties.java |21 +- .../css/lib/api/properties/TokenAcceptor.java |43 +- .../css/lib/nblexer/CaseInsensitiveNbLexerCHS.java | 3 +- .../modules/css/lib/nblexer/NbLexerCharStream.java | 3 +- .../modules/css/lib/properties/GrammarParser.java | 112 +- .../google-chrome-css-custom-properties.css| 199 + .../netbeans/modules/css/lib/Css3ParserTest.java |25 +- .../org/netbeans/modules/css/lib/CssTestBase.java |44 +- .../properties/GrammarResolverListenerTest.java| 9 +- .../css/lib/api/properties/PropertyValueTest.java | 5 - .../modules/css/lib/nblexer/NbCss3LexerTest.java |38 +- .../css/lib/properties/GrammarParserTest.java | 8 +- ide/css.model/nbproject/project.xml| 4 +- .../modules/css/model/impl/ElementFactoryImpl.java |24 +- ide/css.prep/nbproject/project.xml | 4 +- ide/css.visual/nbproject/project.xml | 4 +- .../modules/css/visual/RuleEditorNode.java |20 +- ide/html.editor/nbproject/project.xml | 4 +- javafx/javafx2.editor/nbproject/project.xml| 4 +- webcommon/javascript2.editor/nbproject/project.xml | 4 +- webcommon/javascript2.html/nbproject/project.xml | 4 +- webcommon/javascript2.jade/nbproject/project.xml | 4 +- webcommon/web.inspect/nbproject/project.xml| 4 +- 41 files changed, 14973 insertions(+), 12698 deletions(-) create mode 100644 ide/css.lib/test/unit/data/testfiles/google-chrome-css-custom-properties.css - 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: UnsupportedOperationException in maven dependency graph "Exclude dependency" and "Fix Version Conflict" actions
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 cc6a2cb29e UnsupportedOperationException in maven dependency graph
"Exclude dependency" and "Fix Version Conflict" actions
new 379a0ab42b Merge pull request #5431 from matthiasblaesing/github-5402
cc6a2cb29e is described below
commit cc6a2cb29e346b1db601a573c8cd7473907a28f7
Author: Matthias Bläsing
AuthorDate: Sat Feb 4 22:02:31 2023 +0100
UnsupportedOperationException in maven dependency graph "Exclude
dependency" and "Fix Version Conflict" actions
The two actions:
org.netbeans.modules.maven.graph.FixVersionConflictAction
org.netbeans.modules.maven.graph.ExcludeDepAction
need to manipulate the duplicate or conflict list. The returned set is
read-only, so a companion method to addDuplicateOrConflict
removeDuplicateOrConflict is added to remove a node from the list.
Closes: #5402
---
java/java.graph/manifest.mf | 2 +-
.../src/org/netbeans/modules/java/graph/DependencyGraphScene.java | 3 +--
java/java.graph/src/org/netbeans/modules/java/graph/GraphNode.java | 6 +-
java/maven.graph/nbproject/project.xml | 2 +-
.../src/org/netbeans/modules/maven/graph/MavenAction.java | 6 --
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/java/java.graph/manifest.mf b/java/java.graph/manifest.mf
index 56a77455f1..0fa9c9b458 100644
--- a/java/java.graph/manifest.mf
+++ b/java/java.graph/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.java.graph/1
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/java/graph/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.20
+OpenIDE-Module-Specification-Version: 1.21
diff --git
a/java/java.graph/src/org/netbeans/modules/java/graph/DependencyGraphScene.java
b/java/java.graph/src/org/netbeans/modules/java/graph/DependencyGraphScene.java
index 893cb98d67..846e311cd4 100644
---
a/java/java.graph/src/org/netbeans/modules/java/graph/DependencyGraphScene.java
+++
b/java/java.graph/src/org/netbeans/modules/java/graph/DependencyGraphScene.java
@@ -482,8 +482,7 @@ public class DependencyGraphScene extends Gra
if(supportsVersions()) {
// other important paths
-ArrayList representants = new
ArrayList<>(node.getDuplicatesOrConflicts());
-for (GraphNodeImplementation curRep : representants) {
+for (GraphNodeImplementation curRep :
node.getDuplicatesOrConflicts()) {
addPathToRoot(curRep, curRep.getParent(), otherPathsEdges,
importantNodes);
}
}
diff --git a/java/java.graph/src/org/netbeans/modules/java/graph/GraphNode.java
b/java/java.graph/src/org/netbeans/modules/java/graph/GraphNode.java
index 0e6445d085..9f0e52634d 100644
--- a/java/java.graph/src/org/netbeans/modules/java/graph/GraphNode.java
+++ b/java/java.graph/src/org/netbeans/modules/java/graph/GraphNode.java
@@ -42,7 +42,7 @@ public final class GraphNode {
private I impl, parentAfterFix;
-private final HashSet duplicates;
+private final Set duplicates;
private int level;
private int managedState = UNMANAGED;
@@ -72,6 +72,10 @@ public final class GraphNode {
duplicates.add(i);
}
+public void removeDuplicateOrConflict(I i) {
+duplicates.remove(i);
+}
+
public Set getDuplicatesOrConflicts() {
return Collections.unmodifiableSet(duplicates);
}
diff --git a/java/maven.graph/nbproject/project.xml
b/java/maven.graph/nbproject/project.xml
index 010dacdbcf..823d736d32 100644
--- a/java/maven.graph/nbproject/project.xml
+++ b/java/maven.graph/nbproject/project.xml
@@ -57,7 +57,7 @@
1
-1.1
+1.21
diff --git
a/java/maven.graph/src/org/netbeans/modules/maven/graph/MavenAction.java
b/java/maven.graph/src/org/netbeans/modules/maven/graph/MavenAction.java
index bdaf401ab3..e36a6a2487 100644
--- a/java/maven.graph/src/org/netbeans/modules/maven/graph/MavenAction.java
+++ b/java/maven.graph/src/org/netbeans/modules/maven/graph/MavenAction.java
@@ -164,7 +164,9 @@ public abstract class MavenAction extends AbstractAction {
}
}
// note, must be called before node removing edges to work correctly
-node.getDuplicatesOrConflicts().removeAll(toExclude);
+for(MavenDependencyNode mdn: toExclude) {
+node.removeDuplicateOrConflict(mdn);
+}
for (GraphEdge age : edge
[netbeans] branch master updated: When placing a dialog through NetBeans' API, if no focused component is found then use NbMainWindow. Change fallback for Utilities.findDialogParent to use NbMainWindo
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 9164e39505 When placing a dialog through NetBeans' API, if no focused
component is found then use NbMainWindow. Change fallback for
Utilities.findDialogParent to use NbMainWindow.
new 23882eec46 Merge pull request #5280 from errael/ImproveDialogPlacement
9164e39505 is described below
commit 9164e3950559c361f69b4cf95317748a1bb363a5
Author: Ernie Rael
AuthorDate: Wed Jan 11 14:40:55 2023 -0800
When placing a dialog through NetBeans' API,
if no focused component is found then use NbMainWindow.
Change fallback for Utilities.findDialogParent to use NbMainWindow.
---
.../core/windows/services/DialogDisplayerImpl.java | 9 +++
.../core/windows/services/NbPresenter.java | 12 +
.../src/org/openide/util/Utilities.java| 31 +-
3 files changed, 39 insertions(+), 13 deletions(-)
diff --git
a/platform/core.windows/src/org/netbeans/core/windows/services/DialogDisplayerImpl.java
b/platform/core.windows/src/org/netbeans/core/windows/services/DialogDisplayerImpl.java
index 63f5fdcadb..8cbcb8227e 100644
---
a/platform/core.windows/src/org/netbeans/core/windows/services/DialogDisplayerImpl.java
+++
b/platform/core.windows/src/org/netbeans/core/windows/services/DialogDisplayerImpl.java
@@ -225,7 +225,7 @@ public class DialogDisplayerImpl extends DialogDisplayer {
// if a modal dialog is active use it as parent
// otherwise use the main window
-NbPresenter presenter = null;
+NbPresenter presenter;
if (descriptor instanceof DialogDescriptor) {
if (NbPresenter.currentModalDialog != null) {
if (NbPresenter.currentModalDialog.isLeaf ()) {
@@ -252,11 +252,8 @@ public class DialogDisplayerImpl extends DialogDisplayer {
presenter = new NbPresenter(descriptor,
NbPresenter.currentModalDialog, true);
}
} else {
-Frame f =
KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow()
-instanceof Frame ?
-(Frame)
KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow()
-: WindowManager.getDefault().getMainWindow();
-
+Window w =
KeyboardFocusManager.getCurrentKeyboardFocusManager ().getActiveWindow ();
+Frame f = w instanceof Frame ? (Frame) w :
WindowManager.getDefault().getMainWindow();
if (noParent) {
f = null;
}
diff --git
a/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java
b/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java
index 1e1ea8a0b2..18fdc69006 100644
---
a/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java
+++
b/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java
@@ -1591,6 +1591,18 @@ implements PropertyChangeListener, WindowListener,
Mutex.Action, Comparato
*/
private Window findFocusedWindow() {
Window w =
KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusedWindow();
+if( w == null ) {
+// PR#5280
+LOG.fine( () -> "No focused window, find mainWindow" );
+for( Frame f01 : Frame.getFrames() ) {
+if( "NbMainWindow".equals(f01.getName())) { //NOI18N
+if(f01.getWidth() != 0 || f01.getHeight() != 0) {
+w = f01;
+}
+break;
+}
+}
+}
while( null != w && !w.isShowing() ) {
w = w.getOwner();
}
diff --git a/platform/openide.util.ui/src/org/openide/util/Utilities.java
b/platform/openide.util.ui/src/org/openide/util/Utilities.java
index ba5d85eb3e..4c632f5d7c 100644
--- a/platform/openide.util.ui/src/org/openide/util/Utilities.java
+++ b/platform/openide.util.ui/src/org/openide/util/Utilities.java
@@ -1157,11 +1157,9 @@ public final class Utilities {
return w.getGraphicsConfiguration();
} else {
//#217737 - try to find the main window which could be placed
in secondary screen
-for( Frame f : Frame.getFrames() ) {
-if( "NbMainWindow".equals(f.getName())) { //NOI18N
-return f.getGraphicsConfiguration();
-}
-}
+Frame f = findMainWindow();
+if(f != null)
+return f.getGraphicsConfiguration();
}
}
[netbeans] branch master updated: Cleanup by simplifying string comparsion with JDK7 Objects.equals()
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 277aa4df57 Cleanup by simplifying string comparsion with JDK7
Objects.equals()
new 5babb32537 Merge pull request #5399 from tbw777/Objects.equals
277aa4df57 is described below
commit 277aa4df57f08b724d1d42cc3f424783e71ef67e
Author: Andrei Briukhov
AuthorDate: Sat Jan 28 00:13:57 2023 +0300
Cleanup by simplifying string comparsion with JDK7 Objects.equals()
Objects.equals() implements normalized comparsion operations for two
objects.
---
.../j2ee/ddloaders/multiview/TextItemEditorModel.java | 4 +++-
.../j2ee/sun/ddloaders/multiview/TextItemEditorModel.java | 4 +++-
.../modules/web/debug/breakpoints/JspLineBreakpoint.java | 9 +++--
.../src/org/netbeans/modules/schema2beans/BaseBean.java| 14 ++
.../org/netbeans/modules/schema2beans/BeanComparator.java | 6 +-
.../modules/subversion/ui/status/VersioningPanel.java | 2 +-
.../netbeans/api/debugger/jpda/ExceptionBreakpoint.java| 6 +++---
.../org/netbeans/api/debugger/jpda/FieldBreakpoint.java| 12 +++-
.../org/netbeans/api/debugger/jpda/MethodBreakpoint.java | 9 +++--
.../modules/dbschema/jdbcimpl/SchemaElementImpl.java | 4 ++--
.../jpda/ui/models/BoldVariablesTableModelFilter.java | 5 ++---
.../jpda/visual/breakpoints/ComponentBreakpoint.java | 3 ++-
.../org/netbeans/modules/i18n/form/I18nServiceImpl.java| 3 +--
java/i18n/src/org/netbeans/modules/i18n/I18nString.java| 8 +---
.../core/startup/layers/NbinstURLStreamHandler.java| 4 ++--
.../src/org/openide/windows/TopComponent.java | 5 +++--
16 files changed, 43 insertions(+), 55 deletions(-)
diff --git
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/TextItemEditorModel.java
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/TextItemEditorModel.java
index 66134b64c2..407dabc08c 100644
---
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/TextItemEditorModel.java
+++
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/TextItemEditorModel.java
@@ -22,6 +22,8 @@ package org.netbeans.modules.j2ee.ddloaders.multiview;
import org.netbeans.modules.xml.multiview.ItemEditorHelper;
import org.netbeans.modules.xml.multiview.XmlMultiViewDataSynchronizer;
+import java.util.Objects;
+
/**
* @author pfiala
*/
@@ -62,7 +64,7 @@ public abstract class TextItemEditorModel extends
ItemEditorHelper.ItemEditorMod
}
if (validate(value)) {
String currentValue = getValue();
-if (!(value == currentValue || value != null &&
value.equals(currentValue))) {
+if (!Objects.equals(value, currentValue)) {
setValue(value);
synchronizer.requestUpdateData();
}
diff --git
a/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/ddloaders/multiview/TextItemEditorModel.java
b/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/ddloaders/multiview/TextItemEditorModel.java
index 37d492b032..887ee9bada 100644
---
a/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/ddloaders/multiview/TextItemEditorModel.java
+++
b/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/ddloaders/multiview/TextItemEditorModel.java
@@ -22,6 +22,8 @@ package org.netbeans.modules.j2ee.sun.ddloaders.multiview;
import org.netbeans.modules.xml.multiview.ItemEditorHelper;
import org.netbeans.modules.xml.multiview.XmlMultiViewDataSynchronizer;
+import java.util.Objects;
+
/**
* @author pfiala,pcw
*/
@@ -60,7 +62,7 @@ public abstract class TextItemEditorModel extends
ItemEditorHelper.ItemEditorMod
}
if (validate(value)) {
String currentValue = getValue();
-if (!(value == currentValue || value != null &&
value.equals(currentValue))) {
+if (!Objects.equals(value, currentValue)) {
setValue(value);
synchronizer.requestUpdateData();
}
diff --git
a/enterprise/web.debug/src/org/netbeans/modules/web/debug/breakpoints/JspLineBreakpoint.java
b/enterprise/web.debug/src/org/netbeans/modules/web/debug/breakpoints/JspLineBreakpoint.java
index 851922bbc5..2daa7e7d29 100644
---
a/enterprise/web.debug/src/org/netbeans/modules/web/debug/breakpoints/JspLineBreakpoint.java
+++
b/enterprise/web.debug/src/org/netbeans/modules/web/debug/breakpoints/JspLineBreakpoint.java
@@ -26,6 +26,7 @@ import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
+import java.util.Objects;
import org.netbeans.api.debugger.*;
import org.netbeans.api.debugger
