This is an automated email from the ASF dual-hosted git repository. chrizzly 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 bedc6b5486 Fix wrong popuppath by changing order of popupPresenterFilePath strings (#5034) bedc6b5486 is described below commit bedc6b5486d1a46eeb53c13727505d028a07fe1a Author: Chrizzly <christian.l...@gmx.net> AuthorDate: Sat Dec 3 21:47:15 2022 +0100 Fix wrong popuppath by changing order of popupPresenterFilePath strings (#5034) * Fix wrong popuppath by changing order of popupPresenterFilePath strings Before the fix, the string looked like Editors/Popup/mimeType which was wrong and lead to misbehavior of EditorActions in PopupMenus (Context menu). After the fix, it looks correct now Editors/mimeType/Popup. Also remove unnecessary layer.xml entry which will lead to an empty etnry after the original fix. * Fix typo from "Interrupt exeution" to "Interupt execution" Co-authored-by: Christian Lenz <christian.l...@doksafe.de> --- .../modules/editor/lib2/EditorActionRegistrationProcessor.java | 3 ++- .../src/org/netbeans/modules/jshell/editor/Bundle.properties | 2 +- .../src/org/netbeans/modules/jshell/resources/layer.xml | 9 --------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/ide/editor.lib2/src/org/netbeans/modules/editor/lib2/EditorActionRegistrationProcessor.java b/ide/editor.lib2/src/org/netbeans/modules/editor/lib2/EditorActionRegistrationProcessor.java index b2b768bfaf..3120316c0e 100644 --- a/ide/editor.lib2/src/org/netbeans/modules/editor/lib2/EditorActionRegistrationProcessor.java +++ b/ide/editor.lib2/src/org/netbeans/modules/editor/lib2/EditorActionRegistrationProcessor.java @@ -236,10 +236,11 @@ public final class EditorActionRegistrationProcessor extends LayerGeneratingProc int popupPosition = annotation.popupPosition(); if (popupPosition != Integer.MAX_VALUE) { StringBuilder popupPresenterFilePath = new StringBuilder(50); - popupPresenterFilePath.append("Editors/Popup/"); + popupPresenterFilePath.append("Editors/"); if (mimeType.length() > 0) { popupPresenterFilePath.append(mimeType).append("/"); } + popupPresenterFilePath.append("Popup/"); if (popupPath.length() > 0) { popupPresenterFilePath.append(popupPath).append('/'); } diff --git a/java/jshell.support/src/org/netbeans/modules/jshell/editor/Bundle.properties b/java/jshell.support/src/org/netbeans/modules/jshell/editor/Bundle.properties index 3ba78067ad..b38dddc78d 100644 --- a/java/jshell.support/src/org/netbeans/modules/jshell/editor/Bundle.properties +++ b/java/jshell.support/src/org/netbeans/modules/jshell/editor/Bundle.properties @@ -24,7 +24,7 @@ caret-up=Up jshell-execute=Execute Shell Input jshell-reset=Reset Java Shell -jshell-stop=Interrupt exeution +jshell-stop=Interrupt execution jshell-save-to-class=Save To Class ClassNamePanel.className.text= ClassNamePanel.message.text=\ diff --git a/java/jshell.support/src/org/netbeans/modules/jshell/resources/layer.xml b/java/jshell.support/src/org/netbeans/modules/jshell/resources/layer.xml index ce1b624008..5a95097b48 100644 --- a/java/jshell.support/src/org/netbeans/modules/jshell/resources/layer.xml +++ b/java/jshell.support/src/org/netbeans/modules/jshell/resources/layer.xml @@ -34,15 +34,6 @@ </folder> <folder name="jshell-snippets"/> <folder name="Editors"> - <folder name="Popup"> - <folder name="text"> - <attr name="position" intvalue="9800"/> - <folder name="x-repl"> - <attr name="position" intvalue="9800"/> - </folder> - </folder> - </folder> - <folder name="text"> <folder name="x-repl"> <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.jshell.resources.Bundle"/> --------------------------------------------------------------------- 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