From dbd8cc56d1826103a05d1cefbfbeefb43f6bfd82 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Fri, 23 Sep 2011 21:52:14 +0200
Subject: Reorganize HTTP traffic

---
 main/src/cgeo/geocaching/cgResponse.java | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'main/src/cgeo/geocaching/cgResponse.java')

diff --git a/main/src/cgeo/geocaching/cgResponse.java b/main/src/cgeo/geocaching/cgResponse.java
index 3ac7770..0319761 100644
--- a/main/src/cgeo/geocaching/cgResponse.java
+++ b/main/src/cgeo/geocaching/cgResponse.java
@@ -1,33 +1,33 @@
 package cgeo.geocaching;
 
+import org.apache.http.HttpResponse;
+
 public class cgResponse {
-    private String url;
-    private int statusCode;
-    private String statusMessage;
-    private String data;
+    private String data = null;
+
+    private HttpResponse response = null;
 
-    public void setUrl(String url) {
-        this.url = url;
+    public cgResponse() {
     }
 
-    public String getUrl() {
-        return url;
+    public cgResponse(HttpResponse response) {
+        this.response = response;
     }
 
     public void setStatusCode(int code) {
-        statusCode = code;
+        response.setStatusCode(code);
     }
 
     public int getStatusCode() {
-        return statusCode;
+        return response.getStatusLine().getStatusCode();
     }
 
     public void setStatusMessage(String message) {
-        statusMessage = message;
+        response.setReasonPhrase(message);
     }
 
     public String getStatusMessage() {
-        return statusMessage;
+        return response.getStatusLine().getReasonPhrase();
     }
 
     public void setData(String data) {
@@ -35,6 +35,6 @@ public class cgResponse {
     }
 
     public String getData() {
-        return data;
+        return data == null ? cgBase.getResponseData(response) : data;
     }
 }
-- 
cgit v1.1