svn commit: r1726690 - in /jmeter/trunk: src/components/org/apache/jmeter/assertions/gui/AssertionGui.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Mon Jan 25 20:59:16 2016
New Revision: 1726690

URL: http://svn.apache.org/viewvc?rev=1726690&view=rev
Log:
Bug 58912 Response assertion gui : Deleting more than 1 selected row deletes only one row
#resolve #87
Bugzilla Id: 58912

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java?rev=1726690&r1=1726689&r2=1726690&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java Mon Jan 25 20:59:16 2016
@@ -32,6 +32,7 @@ import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
+import javax.swing.table.TableCellEditor;
 
 import org.apache.jmeter.assertions.ResponseAssertion;
 import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
@@ -407,12 +408,20 @@ public class AssertionGui extends Abstra
     private class ClearPatternsListener implements ActionListener {
         @Override
         public void actionPerformed(ActionEvent e) {
-            int index = stringTable.getSelectedRow();
-            if (index > -1) {
-                stringTable.getCellEditor(index, stringTable.getSelectedColumn()).cancelCellEditing();
-                tableModel.removeRow(index);
+            if (stringTable.isEditing()) {
+                TableCellEditor cellEditor = stringTable.getCellEditor(stringTable.getEditingRow(), stringTable.getEditingColumn());
+                cellEditor.cancelCellEditing();
+            }
+            
+            int[] rowsSelected = stringTable.getSelectedRows();
+            stringTable.clearSelection();
+            if (rowsSelected.length > 0) {
+                for (int i = rowsSelected.length - 1; i >= 0; i--) {
+                    tableModel.removeRow(rowsSelected[i]);
+                }
                 tableModel.fireTableDataChanged();
             }
+
             if (stringTable.getModel().getRowCount() == 0) {
                 deletePattern.setEnabled(false);
             }

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1726690&r1=1726689&r2=1726690&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Mon Jan 25 20:59:16 2016
@@ -254,6 +254,7 @@ Summary
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
 <ul>
 <li><bug>58079</bug>Do not cache HTTP samples that have a Vary header when using a HTTP CacheManager.</li>
+<li><bug>58912</bug>Response assertion gui : Deleting more than 1 selected row deletes only one row. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
 </ul>
 
 <h3>Functions</h3>