You are viewing a plain text version of this content. The canonical link for it is here.
Posted to devnull@infra.apache.org by vl...@apache.org on 2019/06/08 18:41:30 UTC
[jmeter] 01/02: This commit was manufactured by cvs2svn to create
tag 'v1_7_3'.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to annotated tag v1_7_3
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit c4f53207bbd54ad25845c7b0e6d501a0963f5adf
Author: No Author <de...@apache.org>
AuthorDate: Fri Aug 16 13:05:35 2002 +0000
This commit was manufactured by cvs2svn to create tag 'v1_7_3'.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/tags/v1_7_3@322853 13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 2e1448ef6fc972e50ac916c764a2f99c587e19a0
---
.../apache/jmeter/config/gui/ArgumentsPanel.java | 9 ++---
.../protocol/http/gui/HTTPArgumentsPanel.java | 41 +++-------------------
xdocs/usermanual/component_reference.xml | 3 +-
3 files changed, 10 insertions(+), 43 deletions(-)
diff --git a/src/components/org/apache/jmeter/config/gui/ArgumentsPanel.java b/src/components/org/apache/jmeter/config/gui/ArgumentsPanel.java
index da816ab..14ca469 100644
--- a/src/components/org/apache/jmeter/config/gui/ArgumentsPanel.java
+++ b/src/components/org/apache/jmeter/config/gui/ArgumentsPanel.java
@@ -69,6 +69,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
import javax.swing.event.CellEditorListener;
import javax.swing.event.ChangeEvent;
import javax.swing.table.TableCellEditor;
@@ -308,10 +309,10 @@ public class ArgumentsPanel extends AbstractConfigGui implements FocusListener,
TextAreaCellRenderer renderer = new TextAreaCellRenderer();
table.setRowHeight(renderer.getPreferredHeight());
table.setDefaultRenderer(String.class,renderer);
- //table.setCellSelectionEnabled(true);
+ table.setCellSelectionEnabled(true);
table.setRowSelectionAllowed(true);
- //table.setColumnSelectionAllowed(false);
- //table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ table.setColumnSelectionAllowed(false);
+ table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
JScrollPane scroller = new JScrollPane(table);
Dimension tableDim = scroller.getPreferredSize();
@@ -396,7 +397,7 @@ public class ArgumentsPanel extends AbstractConfigGui implements FocusListener,
gui.tableModel.addNewRow();
gui.tableModel.setValueAt("howdy",0,0);
gui.tableModel.setValueAt("doody",0,1);
- assertNull(((Argument)((Arguments)gui.createTestElement()).getArguments().get(0)).getMetaData());
+ assertEquals("=",((Argument)((Arguments)gui.createTestElement()).getArguments().get(0)).getMetaData());
}
}
}
diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
index afa304a..79a6969 100644
--- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
+++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
@@ -5,6 +5,7 @@ import java.net.URLEncoder;
import java.util.Iterator;
import javax.swing.event.ChangeEvent;
+import javax.swing.table.TableCellEditor;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.gui.ArgumentsPanel;
@@ -26,10 +27,11 @@ public class HTTPArgumentsPanel extends ArgumentsPanel {
private static final String ENCODED_VALUE = JMeterUtils.getResString("encoded_value");
private static final String ENCODE_OR_NOT = JMeterUtils.getResString("encode?");
+
protected void initializeTableModel() {
tableModel = new PowerTableModel(new String[]{Arguments.COLUMN_NAMES[0],Arguments.COLUMN_NAMES[1],
- ENCODED_VALUE,ENCODE_OR_NOT},
- new Class[]{String.class,String.class,String.class,Boolean.class});
+ ENCODE_OR_NOT},
+ new Class[]{String.class,String.class,Boolean.class});
}
public HTTPArgumentsPanel()
@@ -66,21 +68,6 @@ public class HTTPArgumentsPanel extends ArgumentsPanel {
return (TestElement)args.clone();
}
- private void updateEncodedColumn(int row)
- {
- if(((Boolean)tableModel.getValueAt(row,3)).booleanValue())
- {
- tableModel.setValueAt(URLEncoder.encode((String)tableModel.getValueAt(row,0))+"="+
- URLEncoder.encode((String)tableModel.getValueAt(row,1)),row,2);
- }
- else
- {
- tableModel.setValueAt(tableModel.getValueAt(row,0)+"="+
- tableModel.getValueAt(row,1),row,2);
- }
- tableModel.fireTableDataChanged();
- }
-
/****************************************
* !ToDo (Method description)
*
@@ -98,29 +85,9 @@ public class HTTPArgumentsPanel extends ArgumentsPanel {
{
HTTPArgument arg = (HTTPArgument)iter.next();
tableModel.addRow(new Object[]{arg.getName(),arg.getValue(),
- arg.getEncodedName()+arg.getMetaData()+arg.getEncodedValue(),
new Boolean(arg.getAlwaysEncode())});
}
}
checkDeleteStatus();
}
-
- public void focusLost(FocusEvent e)
- {
- super.focusLost(e);
- for(int x = 0; x < tableModel.getRowCount();x++)
- {
- updateEncodedColumn(x);
- }
- }
-
- public void editingCanceled(ChangeEvent e)
- {
- }
-
- public void editingStopped(ChangeEvent e)
- {
- updateEncodedColumn(((TextAreaTableCellEditor)e.getSource()).getRow());
- }
-
}
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 5858b85..c5c1753 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -82,8 +82,7 @@ resource requires query string parameters, add them below in the
<p>
Additionally, you can specify whether each paramter should be URL encoded. If you are not sure what this
means, it is probably best to select it. If your values contain characters such as &amp; or spaces, or
- question marks, then encoding is usually required. The column labeled "Url Encoded Value" shows how the
- parameter name and value will be sent to the server. Do not edit this field - it will have no effect.</p></property>
+ question marks, then encoding is usually required.</p></property>
<property name="Filename" required="No">Name of the file to send. If left blank, JMeter
does not send a file, if filled in, JMeter automatically sends the request as
a multipart form request.</property>