jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1524817 - in /jmeter/trunk: src/core/org/apache/jmeter/config/gui/RowDetailDialog.java xdocs/changes.xml
Date Thu, 19 Sep 2013 20:07:03 GMT
Author: pmouawad
Date: Thu Sep 19 20:07:03 2013
New Revision: 1524817

URL: http://svn.apache.org/r1524817
Log:
Bug 55572 - Detail popup of parameter does not show a Scrollbar when content exceeds display
Bugzilla Id: 55572

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java?rev=1524817&r1=1524816&r2=1524817&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java Thu Sep 19 20:07:03
2013
@@ -19,7 +19,6 @@
 package org.apache.jmeter.config.gui;
 
 import java.awt.BorderLayout;
-import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -37,13 +36,13 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JRootPane;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
 import org.apache.jmeter.gui.action.KeyStrokes;
+import org.apache.jmeter.gui.util.JSyntaxTextArea;
+import org.apache.jmeter.gui.util.JTextScrollPane;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.ComponentUtil;
 import org.apache.jorphan.gui.ObjectTableModel;
@@ -72,7 +71,7 @@ public class RowDetailDialog extends JDi
 
     private JLabel valueLabel;
 
-    private JTextArea valueTA;
+    private JSyntaxTextArea valueTA;
 
     private JButton nextButton;
 
@@ -146,15 +145,13 @@ public class RowDetailDialog extends JDi
         namePane.add(nameTF, BorderLayout.CENTER);
 
         valueLabel = new JLabel(JMeterUtils.getResString("value")); //$NON-NLS-1$
-        valueTA = new JTextArea();
-        valueTA.setLineWrap(true);
-        valueTA.setWrapStyleWord(true);
+        valueTA = new JSyntaxTextArea(30, 80);
         valueTA.getDocument().addDocumentListener(this);
-        valueTA.setPreferredSize(new Dimension(450, 300));
         setValues(selectedRow);
         JPanel valuePane = new JPanel(new BorderLayout());
         valuePane.add(valueLabel, BorderLayout.NORTH);
-        valuePane.add(new JScrollPane(valueTA), BorderLayout.CENTER);
+        JTextScrollPane jTextScrollPane = new JTextScrollPane(valueTA);
+        valuePane.add(jTextScrollPane, BorderLayout.CENTER);
 
         JPanel detailPanel = new JPanel(new BorderLayout());
         detailPanel.add(namePane, BorderLayout.NORTH);
@@ -228,6 +225,7 @@ public class RowDetailDialog extends JDi
     private void setValues(int selectedRow) {
         nameTF.setText((String)tableModel.getValueAt(selectedRow, 0));
         valueTA.setText((String)tableModel.getValueAt(selectedRow, 1));
+        valueTA.setCaretPosition(0);
         textChanged = false;
     }
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1524817&r1=1524816&r2=1524817&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Thu Sep 19 20:07:03 2013
@@ -253,6 +253,12 @@ The retry count for the HttpClient 3.1 a
 Previously the default was 1, which could cause unexpected additional traffic.
 </p>
 
+<p>Starting with this version, JMeter Proxy Server tries to detect when a sample is
the result of a previous
+redirect. If the current response is a redirect, JMeter will save the redirect URL. When
the next request is received, 
+it is compared with the saved redirect URL and if there is a match, JMeter will disable the
generated sample.
+To revert to previous behaviour, set the property <code>proxy.redirect.disabling=false</code>
+ </p>
+
 <p>__escapeOroRegexpChars function does not trim anymore the value when escaping it
from ORO reserved characters (see <bugzilla>55328</bugzilla>)</p>
 
 <p>commons-lang-2.6.jar has been removed from embedded libraries in jmeter/lib folder.
If you use any plugin or third-party code that depends on it, you need to add it in jmeter/lib
folder</p>
@@ -347,6 +353,7 @@ Previously the default was 1, which coul
 <li><bugzilla>55459</bugzilla> - Elements using ComboStringEditor lose
the input value if user selects another Test Element</li>
 <li><bugzilla>54152</bugzilla> - In distributed testing : activeThreads
always show 0 in GUI and Summariser</li>
 <li><bugzilla>55509</bugzilla> - Allow Plugins to be notified of remote
thread number progression</li>
+<li><bugzilla>55572</bugzilla> - Detail popup of parameter does not show
a Scrollbar when content exceeds display</li>
 </ul>
 
 <!-- =================== Improvements =================== -->
@@ -454,7 +461,7 @@ Previously the default was 1, which coul
 <li><bugzilla>54903</bugzilla> - Remove the dependency on the Activation
Framework. Contributed by Emmanuel Bourg (ebourg at apache.org)</li>
 <li>Moved commons-lang (2.6) to lib/doc as it's only needed by Velocity.</li>
 <li>Re-organised and simplified NOTICE and LICENSE files.</li>
-<li><bugzilla>55411</bugzilla> - NativeCommand could be useful elsewhere.
Copied code to o.a.jorphan.exec.</li>
+<li><bugzilla>55411</bugzilla> -  NativeCommand could be useful elsewhere.
Copied code to o.a.jorphan.exec.</li>
 <li><bugzilla>55435</bugzilla> - ComboStringEditor could be simplified
to make most settings final</li>
 <li><bugzilla>55436</bugzilla> - ComboStringEditor should implement ClearGui</li>
 <li><bugzilla>55463</bugzilla> - Component.requestFocus() is discouraged;
use requestFocusInWindow() instead</li>



Mime
View raw message