Revision cc0120ab src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java
b/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java | ||
---|---|---|
39 | 39 |
import gr.grnet.pithos.web.client.Pithos; |
40 | 40 |
import gr.grnet.pithos.web.client.SharingUsers; |
41 | 41 |
import gr.grnet.pithos.web.client.foldertree.AccountResource; |
42 |
import gr.grnet.pithos.web.client.foldertree.File; |
|
43 | 42 |
import gr.grnet.pithos.web.client.foldertree.Folder; |
44 |
import gr.grnet.pithos.web.client.mysharedtree.MysharedTreeView; |
|
45 | 43 |
import gr.grnet.pithos.web.client.othersharedtree.OtherSharedTreeView.Templates; |
46 | 44 |
import gr.grnet.pithos.web.client.rest.GetRequest; |
47 | 45 |
import gr.grnet.pithos.web.client.rest.RestException; |
48 | 46 |
|
49 | 47 |
import java.util.HashMap; |
50 |
import java.util.HashSet; |
|
51 | 48 |
import java.util.Iterator; |
52 | 49 |
import java.util.Map; |
53 |
import java.util.Set; |
|
54 | 50 |
|
55 | 51 |
import com.google.gwt.cell.client.AbstractCell; |
56 | 52 |
import com.google.gwt.cell.client.Cell; |
... | ... | |
67 | 63 |
import com.google.gwt.user.client.Command; |
68 | 64 |
import com.google.gwt.user.client.ui.AbstractImagePrototype; |
69 | 65 |
import com.google.gwt.view.client.ListDataProvider; |
70 |
import com.google.gwt.view.client.SelectionChangeEvent; |
|
71 |
import com.google.gwt.view.client.SelectionChangeEvent.Handler; |
|
72 | 66 |
import com.google.gwt.view.client.SingleSelectionModel; |
73 | 67 |
import com.google.gwt.view.client.TreeViewModel; |
74 | 68 |
|
... | ... | |
188 | 182 |
app.sessionExpired(); |
189 | 183 |
} |
190 | 184 |
}; |
191 |
getSharingUsers.setHeader("X-Auth-Token", app.getToken()); |
|
185 |
getSharingUsers.setHeader("X-Auth-Token", app.getUserToken());
|
|
192 | 186 |
Scheduler.get().scheduleDeferred(getSharingUsers); |
193 | 187 |
} |
194 | 188 |
|
... | ... | |
263 | 257 |
app.sessionExpired(); |
264 | 258 |
} |
265 | 259 |
}; |
266 |
getUserSharedContainers.setHeader("X-Auth-Token", app.getToken()); |
|
260 |
getUserSharedContainers.setHeader("X-Auth-Token", app.getUserToken());
|
|
267 | 261 |
Scheduler.get().scheduleDeferred(getUserSharedContainers); |
268 | 262 |
} |
269 | 263 |
|
... | ... | |
294 | 288 |
app.sessionExpired(); |
295 | 289 |
} |
296 | 290 |
}; |
297 |
getFolder.setHeader("X-Auth-Token", app.getToken()); |
|
291 |
getFolder.setHeader("X-Auth-Token", app.getUserToken());
|
|
298 | 292 |
Scheduler.get().scheduleDeferred(getFolder); |
299 | 293 |
} |
300 | 294 |
else if (callback != null) |
... | ... | |
348 | 342 |
app.sessionExpired(); |
349 | 343 |
} |
350 | 344 |
}; |
351 |
getFolder.setHeader("X-Auth-Token", app.getToken()); |
|
345 |
getFolder.setHeader("X-Auth-Token", app.getUserToken());
|
|
352 | 346 |
Scheduler.get().scheduleDeferred(getFolder); |
353 | 347 |
} |
354 | 348 |
|
Also available in: Unified diff