You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/01/25 21:54:26 UTC

svn commit: r1726689 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java xdocs/changes.xml

Author: pmouawad
Date: Mon Jan 25 20:54:26 2016
New Revision: 1726689

URL: http://svn.apache.org/viewvc?rev=1726689&view=rev
Log:
Bug 58911 : it should be possible to copy&paste between http header managers
#resolve #86
Bugzilla Id: 58911

Modified:
    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/HeaderPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java?rev=1726689&r1=1726688&r2=1726689&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 Mon Jan 25 20:54:26 2016
@@ -232,9 +232,9 @@ public class HeaderPanel extends Abstrac
 
     /**
      * Add values from the clipboard.
-     * The clipboard is first split into lines, and the lines are then split on ':'
+     * The clipboard is first split into lines, and the lines are then split on ':' or '\t'
      * to produce the header name and value.
-     * Lines without a ':' are ignored.
+     * Lines without a ':' are tested with '\t' and ignored if not found.
      */
     protected void addFromClipboard() {
         GuiUtils.stopTableEditing(this.headerTable);
@@ -247,6 +247,10 @@ public class HeaderPanel extends Abstrac
             String[] clipboardLines = clipboardContent.split("\n"); // $NON-NLS-1$
             for (String clipboardLine : clipboardLines) {
                 int index = clipboardLine.indexOf(":"); // $NON-NLS-1$
+                if(index < 0) {
+                    // when pasting from another header panel the values are separated with '\t'
+                    index = clipboardLine.indexOf("\t");
+                }
                 if (index > 0) {
                     Header header = new Header(clipboardLine.substring(0, index), clipboardLine.substring(index+1));
                     headerManager.add(header);

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1726689&r1=1726688&r2=1726689&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Mon Jan 25 20:54:26 2016
@@ -184,6 +184,7 @@ Summary
 <li><bug>58814</bug>JVM don't recognize option MaxLiveObjectEvacuationRatio; remove from comments</li>
 <li><bug>58810</bug>Config Element Counter (and others): Check Boxes Toggle Area Too Big</li>
 <li><bug>56554</bug>JSR223 Test Element : Generate compilation cache key automatically. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
+<li><bug>58911</bug>Header Manager : it should be possible to copy/paste between Header Managers. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
 </ul>
 <ch_section>Non-functional changes</ch_section>
 <ul>