From 2f98b75ee0cbc8e5af479239dd8863729d79a71b Mon Sep 17 00:00:00 2001
From: Roland Weber <rolandw@apache.org>
Date: Sat, 22 Dec 2007 08:54:55 +0000
Subject: [PATCH] removed param name from HttpConnParams, it's in
 ConnRoutePNames

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@606425 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/http/conn/params/HttpConnParams.java  | 12 ++----------
 .../http/impl/conn/DefaultHttpRoutePlanner.java      |  4 ++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/module-client/src/main/java/org/apache/http/conn/params/HttpConnParams.java b/module-client/src/main/java/org/apache/http/conn/params/HttpConnParams.java
index 47b61f627..439c9f48a 100644
--- a/module-client/src/main/java/org/apache/http/conn/params/HttpConnParams.java
+++ b/module-client/src/main/java/org/apache/http/conn/params/HttpConnParams.java
@@ -42,17 +42,9 @@ import org.apache.http.params.HttpParams;
  * @since 4.0
  */
 public class HttpConnParams {
-     
-    /**
-     * Defines the default proxy. The default value will be used
-     * by some {@link org.apache.http.conn.HttpRoutePlanner HttpRoutePlanner}
-     * implementations, in particular the default implementation.
-     * <p>
-     * This parameter expects a value of type {@link org.apache.http.HttpHost}.
-     * </p>
-     */
-    public static final String DEFAULT_PROXY = "http.default-proxy";
 
+    // since the parameter names have been moved to interfaces,
+    // this class currently is a dummy
 
     /** Disabled default constructor. */
     private HttpConnParams() {
diff --git a/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java b/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
index 4d98cff6a..c0eb56b45 100644
--- a/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
+++ b/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
@@ -41,7 +41,7 @@ import org.apache.http.conn.HttpRoute;
 import org.apache.http.conn.HttpRoutePlanner;
 import org.apache.http.conn.Scheme;
 
-import org.apache.http.conn.params.HttpConnParams;
+import org.apache.http.conn.params.ConnRoutePNames;
 
 
 /**
@@ -82,7 +82,7 @@ public class DefaultHttpRoutePlanner implements HttpRoutePlanner {
         }
 
         HttpHost proxy = (HttpHost)
-            request.getParams().getParameter(HttpConnParams.DEFAULT_PROXY);
+            request.getParams().getParameter(ConnRoutePNames.DEFAULT_PROXY);
 
         Scheme schm = this.connectionManager.getSchemeRegistry().
             getScheme(target.getSchemeName());