You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ne...@apache.org on 2019/07/03 11:49:14 UTC
[netbeans] branch master updated: [NETBEANS-1087] Fixed double
reset action registration on JShell Toolbar
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
The following commit(s) were added to refs/heads/master by this push:
new 3a8da15 [NETBEANS-1087] Fixed double reset action registration on JShell Toolbar
new fe240e7 Merge pull request #1342 from lkishalmi/NETBEANS-1087
3a8da15 is described below
commit 3a8da154abb80cf17f7f003e8ea9983017c633c1
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Sun Jun 30 13:23:18 2019 -0700
[NETBEANS-1087] Fixed double reset action registration on JShell Toolbar
---
.../src/org/netbeans/modules/jshell/editor/ResetAction.java | 2 +-
.../jshell.support/src/org/netbeans/modules/jshell/resources/layer.xml | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/java/jshell.support/src/org/netbeans/modules/jshell/editor/ResetAction.java b/java/jshell.support/src/org/netbeans/modules/jshell/editor/ResetAction.java
index 90e70b8..ca35e72 100644
--- a/java/jshell.support/src/org/netbeans/modules/jshell/editor/ResetAction.java
+++ b/java/jshell.support/src/org/netbeans/modules/jshell/editor/ResetAction.java
@@ -44,7 +44,7 @@ import org.openide.util.NbBundle;
iconResource = "org/netbeans/modules/jshell/resources/reset.png",
mimeType = "text/x-repl",
menuPath = "Edit",
- toolBarPosition = 20000,
+ toolBarPosition = 20002,
menuPosition = 20000
)
@ActionID(category = "Edit", id = "org.netbeans.modules.jshell.editor.ResetAction")
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 7f27890..ce1b624 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
@@ -94,9 +94,6 @@
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
<attr name="position" intvalue="20000"/>
</file>
- <file name="jshell-reset">
- <attr name="position" intvalue="20002"/>
- </file>
<file name="jshell-stop">
<attr name="position" intvalue="20005"/>
</file>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists