Revision 12190a0c web_client/src/gr/grnet/pithos/web/client/rest/GetRequest.java

b/web_client/src/gr/grnet/pithos/web/client/rest/GetRequest.java
41 41
import com.google.gwt.http.client.RequestBuilder;
42 42
import com.google.gwt.http.client.RequestException;
43 43
import com.google.gwt.http.client.Response;
44
import gr.grnet.pithos.web.client.Pithos;
44 45
import gr.grnet.pithos.web.client.foldertree.Resource;
45 46
import java.util.HashMap;
46 47
import java.util.Map;
......
49 50

  
50 51
    private Class<T> aClass;
51 52

  
53
    private String api;
54

  
55
    private String owner;
56
    
52 57
    private String path;
53 58

  
54 59
    private int okCode;
......
63 68

  
64 69
    public abstract void onError(Throwable t);
65 70

  
66
    public GetRequest(Class<T> aClass, String path, int okCode, T result) {
71
    public GetRequest(Class<T> aClass, String api, String owner, String path, int okCode, T result) {
67 72
        this.aClass = aClass;
73
        this.api = api;
74
        this.owner = owner;
68 75
        this.path = path;
69 76
        this.okCode = okCode;
70 77
        this.result = result;
71 78
    }
72 79

  
73
    public GetRequest(Class<T> aClass, String path) {
74
        this(aClass, path, -1, null);
80
    public GetRequest(Class<T> aClass, String api, String owner, String path) {
81
        this(aClass, api, owner, path, -1, null);
75 82
    }
76 83

  
77
    public GetRequest(Class<T> aClass, String path, T result) {
78
        this(aClass, path, -1, result);
84
    public GetRequest(Class<T> aClass, String api, String owner, String path, T result) {
85
        this(aClass, api, owner, path, -1, result);
79 86
    }
80 87

  
81 88
    @Override
82 89
    public void execute() {
83
        RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, path);
90
        RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, api + owner + path);
84 91
        builder.setHeader("If-Modified-Since", "0");
85 92
        for (String header : headers.keySet()) {
86 93
            builder.setHeader(header, headers.get(header));
87 94
        }
88 95
        try {
89
            builder.sendRequest("", new RestRequestCallback<T>(path, okCode) {
96
            builder.sendRequest("", new RestRequestCallback<T>(api + owner + path, okCode) {
90 97
                @Override
91 98
                public void onSuccess(T object) {
92 99
                    GetRequest.this.onSuccess(object);
......
94 101

  
95 102
                @Override
96 103
                public T deserialize(Response response) {
97
                    return Resource.createFromResponse(aClass, response, result);
104
                    return Resource.createFromResponse(aClass, owner, response, result);
98 105
                }
99 106

  
100 107
                @Override

Also available in: Unified diff