You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2016/07/23 13:36:41 UTC
svn commit: r1753871 - in /jmeter/trunk:
src/protocol/http/org/apache/jmeter/protocol/http/gui/ xdocs/
Author: fschumacher
Date: Sat Jul 23 13:36:41 2016
New Revision: 1753871
URL: http://svn.apache.org/viewvc?rev=1753871&view=rev
Log:
Misc cleanup. Removal of unused imports and code deduplication.
Contributed by Benoit Wiart (b.wiart at ubik-inginierie.com)
This closes #218 on github
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java?rev=1753871&r1=1753870&r2=1753871&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java Sat Jul 23 13:36:41 2016
@@ -39,7 +39,6 @@ import javax.swing.ListSelectionModel;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
import javax.swing.table.AbstractTableModel;
-import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
@@ -141,10 +140,7 @@ public class AuthPanel extends AbstractC
tableModel.manager.clear();
tableModel.manager.addTestElement((AuthManager) el.clone());
clearEachIteration.setSelected(((AuthManager) el).getClearEachIteration());
- if (tableModel.getRowCount() != 0) {
- deleteButton.setEnabled(true);
- saveButton.setEnabled(true);
- }
+ checkButtonsStatus();
}
@Override
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java?rev=1753871&r1=1753870&r2=1753871&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java Sat Jul 23 13:36:41 2016
@@ -39,7 +39,6 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
-import javax.swing.table.TableCellEditor;
import org.apache.jmeter.config.gui.AbstractConfigGui;
import org.apache.jmeter.gui.util.FileDialoger;
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java?rev=1753871&r1=1753870&r2=1753871&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java Sat Jul 23 13:36:41 2016
@@ -32,7 +32,6 @@ import javax.swing.JRadioButton;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
-import javax.swing.table.TableCellEditor;
import org.apache.jmeter.config.gui.AbstractConfigGui;
import org.apache.jmeter.gui.util.PowerTableModel;
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java?rev=1753871&r1=1753870&r2=1753871&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java Sat Jul 23 13:36:41 2016
@@ -35,7 +35,6 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
-import javax.swing.table.TableCellEditor;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.gui.util.FileDialoger;
@@ -299,9 +298,7 @@ public class HTTPFileArgsPanel extends J
tableModel.addRow(new HTTPFileArg(path));
- // Enable DELETE (which may already be enabled, but it won't hurt)
- delete.setEnabled(true);
- browse.setEnabled(true);
+ checkDeleteAndBrowseStatus();
// Highlight (select) the appropriate row.
int rowToSelect = tableModel.getRowCount() - 1;
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java?rev=1753871&r1=1753870&r2=1753871&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java Sat Jul 23 13:36:41 2016
@@ -121,9 +121,7 @@ public class HeaderPanel extends Abstrac
headerManager.clear();
super.configure(el);
headerManager.addTestElement(el);
- boolean hasRows = tableModel.getRowCount() > 0;
- deleteButton.setEnabled(hasRows);
- saveButton.setEnabled(hasRows);
+ checkButtonsStatus();
}
@Override
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1753871&r1=1753870&r2=1753871&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Jul 23 13:36:41 2016
@@ -126,6 +126,7 @@ Summary
<li>Updated to tika-core and tika-parsers 1.13 (from 1.12)</li>
<li><pr>215</pr>Reduce duplicated code by using the newly added method <code>GuiUtils#cancelEditing</code>.
Contributed by Benoit Wiart (b.wiart at ubik-ingenierie.com)</li>
+ <li><pr>218</pr>Misc cleanup. Contributed by Benoit Wiart (b.wiart at ubik-ingenierie.com)</li>
</ul>
<!-- =================== Bug fixes =================== -->