svn commit: r1732593 - in /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http: control/HC4CookieHandler.java gui/CookiePanel.java

[sebb]

Author: sebb
Date: Sat Feb 27 01:39:02 2016
New Revision: 1732593

URL: http://svn.apache.org/viewvc?rev=1732593&view=rev
Log:
Change default to HC4/standard
Bugzilla Id: 58756

Modified:
    
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
    
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java?rev=1732593&r1=1732592&r2=1732593&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
 Sat Feb 27 01:39:02 2016
@@ -54,7 +54,8 @@ import org.apache.log.Logger;
 public class HC4CookieHandler implements CookieHandler {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    static String DEFAULT_POLICY_NAME = CookieSpecs.STANDARD; 
+    // Needed by CookiePanel
+    public static String DEFAULT_POLICY_NAME = CookieSpecs.STANDARD; 
 
     public static final String[] AVAILABLE_POLICIES = new String[]{
         DEFAULT_POLICY_NAME,

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=1732593&r1=1732592&r2=1732593&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 Feb 27 01:39:02 2016
@@ -84,6 +84,8 @@ public class CookiePanel extends Abstrac
     private static final String HANDLER_COMMAND = "Handler"; // $NON-NLS-1$
     //--
 
+    private static final String DEFAULT_IMPLEMENTATION = 
HC4CookieHandler.class.getName();
+
     private JTable cookieTable;
 
     private PowerTableModel tableModel;
@@ -278,8 +280,9 @@ public class CookiePanel extends Abstrac
 
         tableModel.clearData();
         clearEachIteration.setSelected(false);
-        selectHandlerPanel.setSelectedItem(CookieManager.DEFAULT_IMPLEMENTATION
-                
.substring(CookieManager.DEFAULT_IMPLEMENTATION.lastIndexOf('.') + 1));
+        policy.setText(HC4CookieHandler.DEFAULT_POLICY_NAME);
+        selectHandlerPanel.setSelectedItem(DEFAULT_IMPLEMENTATION
+                .substring(DEFAULT_IMPLEMENTATION.lastIndexOf('.') + 1));
         deleteButton.setEnabled(false);
         saveButton.setEnabled(false);
     }