Revision f55cf326 web_client/src/gr/grnet/pithos/web/client/rest/GetCommand.java
| b/web_client/src/gr/grnet/pithos/web/client/rest/GetCommand.java | ||
|---|---|---|
| 34 | 34 |
*/ |
| 35 | 35 |
package gr.grnet.pithos.web.client.rest; |
| 36 | 36 |
|
| 37 |
import gr.grnet.pithos.web.client.GSS;
|
|
| 37 |
import gr.grnet.pithos.web.client.Pithos;
|
|
| 38 | 38 |
import gr.grnet.pithos.web.client.rest.resource.FileResource; |
| 39 | 39 |
import gr.grnet.pithos.web.client.rest.resource.FolderResource; |
| 40 | 40 |
import gr.grnet.pithos.web.client.rest.resource.GroupResource; |
| ... | ... | |
| 132 | 132 |
public GetCommand(Class<T> theclass, String pathToGet, boolean showLoading, T theCached){
|
| 133 | 133 |
setShowLoadingIndicator(showLoading); |
| 134 | 134 |
if(isShowLoadingIndicator()) |
| 135 |
GSS.get().showLoadingIndicator("Getting ",pathToGet);
|
|
| 135 |
Pithos.get().showLoadingIndicator("Getting ",pathToGet);
|
|
| 136 | 136 |
this.aclass = theclass; |
| 137 | 137 |
if(pathToGet.indexOf("?") != -1)
|
| 138 | 138 |
path = pathToGet; |
| ... | ... | |
| 148 | 148 |
public GetCommand(Class<T> theclass, String aUsername , String pathToGet, boolean showLoading, T theCached){
|
| 149 | 149 |
setShowLoadingIndicator(showLoading); |
| 150 | 150 |
if(isShowLoadingIndicator()) |
| 151 |
GSS.get().showLoadingIndicator("Getting ",pathToGet);
|
|
| 151 |
Pithos.get().showLoadingIndicator("Getting ",pathToGet);
|
|
| 152 | 152 |
this.aclass = theclass; |
| 153 | 153 |
path = fixPath(pathToGet); |
| 154 | 154 |
this.username = aUsername; |
| ... | ... | |
| 227 | 227 |
else {
|
| 228 | 228 |
// Use cache data |
| 229 | 229 |
if(isShowLoadingIndicator()) |
| 230 |
GSS.get().hideLoadingIndicator();
|
|
| 230 |
Pithos.get().hideLoadingIndicator();
|
|
| 231 | 231 |
if (resp.result instanceof Throwable) {
|
| 232 | 232 |
// Error to be handled |
| 233 | 233 |
Throwable ex = (Throwable) resp.result; |
| ... | ... | |
| 251 | 251 |
|
| 252 | 252 |
if(com){
|
| 253 | 253 |
if(isShowLoadingIndicator()) |
| 254 |
GSS.get().hideLoadingIndicator();
|
|
| 254 |
Pithos.get().hideLoadingIndicator();
|
|
| 255 | 255 |
if(getResult() != null) {
|
| 256 | 256 |
// Add to cache |
| 257 | 257 |
cache.put(key, new ResponseData(System.currentTimeMillis(), getResult())); |
| ... | ... | |
| 274 | 274 |
} |
| 275 | 275 |
else if(aclass.equals(FileResource.class)){
|
| 276 | 276 |
result1 = new FileResource(aPath); |
| 277 |
result1.createFromJSON(response.getHeader("X-GSS-Metadata"));
|
|
| 277 |
result1.createFromJSON(response.getHeader("X-Pithos-Metadata"));
|
|
| 278 | 278 |
} |
| 279 | 279 |
else if(aclass.equals(GroupsResource.class)){
|
| 280 | 280 |
result1 = new GroupsResource(aPath); |
Also available in: Unified diff