Author: fschumacher
Date: Thu Nov 1 20:52:24 2018
New Revision: 1845516
URL: http://svn.apache.org/viewvc?rev=1845516&view=rev
Log:
Expand/Collapse short key - (minus sign) on numpad doesn't work.
Contributed by Ori Marko (orimarko at gmail.com)
Closes #401 on github
Bugzilla Id: 62257
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java?rev=1845516&r1=1845515&r2=1845516&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java Thu Nov
1 20:52:24 2018
@@ -81,8 +81,12 @@ public final class KeyStrokes {
public static final KeyStroke ACTION_STOP =
KeyStroke.getKeyStroke(KeyEvent.VK_PERIOD, CONTROL_MASK);
public static final KeyStroke ACTION_SHUTDOWN =
KeyStroke.getKeyStroke(KeyEvent.VK_COMMA, CONTROL_MASK);
public static final KeyStroke COLLAPSE_ALL =
KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, CONTROL_MASK);
+ // Allow subtract key (numpad) to be used for collapse/expand action
+ public static final KeyStroke COLLAPSE_ALL_SUBTRACT =
KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT, CONTROL_MASK);
// VK_PLUS + CTRL_DOWN_MASK did not work...
public static final KeyStroke EXPAND_ALL =
KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, CONTROL_MASK |
InputEvent.SHIFT_DOWN_MASK);
+ public static final KeyStroke EXPAND_ALL_SUBTRACT =
KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT,
+ CONTROL_MASK | InputEvent.SHIFT_DOWN_MASK);
public static final KeyStroke ALT_UP_ARROW =
KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.ALT_DOWN_MASK);
public static final KeyStroke ALT_DOWN_ARROW =
KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.ALT_DOWN_MASK);
public static final KeyStroke ALT_LEFT_ARROW =
KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.ALT_DOWN_MASK);
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java?rev=1845516&r1=1845515&r2=1845516&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
Thu Nov 1 20:52:24 2018
@@ -206,12 +206,14 @@ public class JMeterTreeListener implemen
actionName = ActionNames.MOVE_LEFT;
} else if (KeyStrokes.matches(e, KeyStrokes.ALT_RIGHT_ARROW)) {
actionName = ActionNames.MOVE_RIGHT;
- } else if (KeyStrokes.matches(e, KeyStrokes.SHIFT_LEFT_ARROW)) {
+ } else if (KeyStrokes.matches(e, KeyStrokes.SHIFT_LEFT_ARROW)
+ || KeyStrokes.matches(e, KeyStrokes.COLLAPSE_ALL_SUBTRACT)) {
actionName = ActionNames.COLLAPSE;
- } else if (KeyStrokes.matches(e, KeyStrokes.SHIFT_RIGHT_ARROW)) {
+ } else if (KeyStrokes.matches(e, KeyStrokes.SHIFT_RIGHT_ARROW)
+ || KeyStrokes.matches(e, KeyStrokes.EXPAND_ALL_SUBTRACT)) {
actionName = ActionNames.EXPAND;
- }
-
+ }
+
if (actionName != null) {
final ActionRouter actionRouter = ActionRouter.getInstance();
actionRouter.doActionNow(new ActionEvent(e.getSource(), e.getID(),
actionName));
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1845516&r1=1845515&r2=1845516&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Nov 1 20:52:24 2018
@@ -115,6 +115,7 @@ Summary
<li><pr>394</pr>Allow <code>null</code> values in
<code>FieldStringEditor</code>. Based on patch by Mingun (alexander_sergey at
mail.ru)</li>
<li><bug>62826</bug>When changing LAF, make JMeter restart if user clicks
yes to popup</li>
<li><bug>62744</bug>Upgrade jquery to version 3.3.1, jquery-ui to 1.12.1,
bootstrap to 3.3.7</li>
+ <li><bug>62257</bug><pr>401</pr>Expand/Collapse short key
<keysym>-</keysym> (minus sign) on numpad doesn't work. Contributed by Ori
Marko (orimarko at gmail.com)</li>
</ul>
<ch_section>Non-functional changes</ch_section>
@@ -202,10 +203,10 @@ Summary
<li>Stefan Seide (stefan at trilobyte-se.de)</li>
<li>刘士 (liushilive at outlook.com)</li>
<li>Michael Pavlov (michael.paulau at gmail.com)</li>
+ <li>Ori Marko (orimarko at gmail.com)</li>
</ul>
<p>We also thank bug reporters who helped us improve JMeter.</p>
<ul>
- <li>Ori Marko (orimarko at gmail.com>)</li>
</ul>
<p>
Apologies if we have omitted anyone else.
