From commits-return-6056-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Tue Oct 18 13:30:28 2016 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2B1021923E for ; Tue, 18 Oct 2016 13:30:28 +0000 (UTC) Received: (qmail 29768 invoked by uid 500); 18 Oct 2016 13:30:28 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 29733 invoked by uid 500); 18 Oct 2016 13:30:27 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 29722 invoked by uid 99); 18 Oct 2016 13:30:27 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Oct 2016 13:30:27 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id A178BC0FB9 for ; Tue, 18 Oct 2016 13:30:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.199 X-Spam-Level: X-Spam-Status: No, score=-1.199 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id PHJQagti2txy for ; Tue, 18 Oct 2016 13:30:25 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id AB9765F257 for ; Tue, 18 Oct 2016 13:30:24 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 82552E031B for ; Tue, 18 Oct 2016 13:30:23 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 05B043A15BA for ; Tue, 18 Oct 2016 13:30:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1765437 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/SavePropertyDialog.java xdocs/changes.xml Date: Tue, 18 Oct 2016 13:30:22 -0000 To: commits@jmeter.apache.org From: pmouawad@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161018133023.05B043A15BA@svn01-us-west.apache.org> Author: pmouawad Date: Tue Oct 18 13:30:22 2016 New Revision: 1765437 URL: http://svn.apache.org/viewvc?rev=1765437&view=rev Log: Bug 60267 - UX : In View Results Tree it should be possible to close the Configure popup by typing escape Contributed by Ubik Load Pack (support at ubikloadpack.com) Bugzilla Id: 60267 Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java jmeter/trunk/xdocs/changes.xml Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java?rev=1765437&r1=1765436&r2=1765437&view=diff ============================================================================== --- jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java Tue Oct 18 13:30:22 2016 @@ -31,11 +31,17 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.InputMap; import javax.swing.JButton; import javax.swing.JCheckBox; +import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JPanel; +import javax.swing.JRootPane; +import org.apache.jmeter.gui.action.KeyStrokes; import org.apache.jmeter.samplers.SampleSaveConfiguration; import org.apache.jmeter.util.JMeterUtils; import org.apache.jorphan.logging.LoggingManager; @@ -114,6 +120,26 @@ public class SavePropertyDialog extends } }); } + + @Override + protected JRootPane createRootPane() { + JRootPane rootPane = new JRootPane(); + Action escapeAction = new AbstractAction("ESCAPE") { + /** + * + */ + private static final long serialVersionUID = 2208129319916921772L; + + @Override + public void actionPerformed(ActionEvent e) { + setVisible(false); + } + }; + InputMap inputMap = rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); + inputMap.put(KeyStrokes.ESC, escapeAction.getValue(Action.NAME)); + rootPane.getActionMap().put(escapeAction.getValue(Action.NAME), escapeAction); + return rootPane; + } @Override public void actionPerformed(ActionEvent e) { Modified: jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1765437&r1=1765436&r2=1765437&view=diff ============================================================================== --- jmeter/trunk/xdocs/changes.xml [utf-8] (original) +++ jmeter/trunk/xdocs/changes.xml [utf-8] Tue Oct 18 13:30:22 2016 @@ -127,6 +127,7 @@ Summary
  • 60109Summariser : Make it ignore TC generated SampleResult in its summary computations
  • 59948Add a formatted and sane HTML source code render to View Results Tree
  • 60252Add sent kbytes/s to Aggregate Report and Summary report
    • +
  • 60267UX : In View Results Tree it should be possible to close the Configure popup by typing escape. Contributed by Ubik Load Pack (support at ubikloadpack.com)

    • Timers, Assertions, Config, Pre- & Post-Processors