This is an automated email from the ASF dual-hosted git repository.

neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 0fab71ce352999143402ff588dcb07f131cfd05e
Merge: ebd5019465 5d6c0c0646
Author: Neil C Smith <neilcsm...@apache.org>
AuthorDate: Mon Aug 7 10:07:01 2023 +0100

    Merge pull request #6276 from apache/delivery
    
    Sync delivery to master after 19-rc4

 .../impl/ejb/annotation/EnterpriseBeansImpl.java   |  1 +
 .../dd/impl/web/annotation/AnnotationHelpers.java  |  1 +
 .../j2ee/ejbcore/action/SendJMSGenerator.java      |  1 +
 .../api/methodcontroller/EjbMethodController.java  |  2 +-
 .../ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java  |  3 +-
 .../ejb/wizard/jpa/dao/EjbFacadeWizardPanel2.java  |  3 +-
 .../ejb/wizard/mdb/MdbPropertiesPanelVisual.java   |  1 +
 .../wizard/mdb/MessageDestinationUiSupport.java    |  1 +
 .../wizard/session/SessionEJBWizardDescriptor.java |  3 +-
 .../ejb/wizard/session/SessionEJBWizardPanel.java  |  6 +--
 .../rules/AsynchronousMethodInvocation.java        |  1 +
 .../web/jsf/impl/metamodel/ObjectProviders.java    |  1 +
 .../modules/db/sql/loader/SQLCloneableEditor.java  |  8 ++--
 .../modules/db/sql/loader/SQLEditorSupport.java    |  2 +
 .../netbeans/lib/terminalemulator/StreamTerm.java  | 10 ++++-
 .../orm/annotation/EntityMappingsImpl.java         |  1 +
 .../netbeans/modules/java/lsp/server/Utils.java    | 49 ++++++++++++++++++----
 .../java/lsp/server/protocol/LspTemplateUI.java    | 19 +--------
 .../lsp/server/protocol/NbCodeClientWrapper.java   | 13 +++++-
 .../lsp/server/ui/NotifyDescriptorAdapter.java     |  6 ++-
 .../modules/java/lsp/server/UtilsTest.java         | 32 ++++++++++++++
 .../lsp/server/protocol/LspTemplateUITest.java     | 24 +++++++++++
 java/java.lsp.server/vscode/CHANGELOG.md           | 13 +++++-
 .../org/netbeans/api/java/source/TreeMaker.java    | 11 +++++
 .../netbeans/modules/javadoc/hints/AddTagFix.java  |  2 +-
 .../modules/javadoc/hints/RemoveTagFix.java        |  2 +-
 .../core/windows/services/DialogDisplayerImpl.java | 48 +++++++++++++++------
 .../netbeans/core/windows/services/NbDialog.java   |  8 ----
 .../core/windows/services/NbPresenter.java         | 20 ++-------
 .../core/windows/services/NbDialogTest.java        |  7 ++--
 .../core/windows/services/NbPresenterTest.java     | 11 ++---
 .../core/windows/services/NotifyLaterTest.java     |  2 +-
 32 files changed, 221 insertions(+), 91 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

Reply via email to