Revision cc0120ab src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java
b/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java | ||
---|---|---|
40 | 40 |
import gr.grnet.pithos.web.client.foldertree.AccountResource; |
41 | 41 |
import gr.grnet.pithos.web.client.foldertree.File; |
42 | 42 |
import gr.grnet.pithos.web.client.foldertree.Folder; |
43 |
import gr.grnet.pithos.web.client.foldertree.FolderTreeView; |
|
44 | 43 |
import gr.grnet.pithos.web.client.mysharedtree.MysharedTreeView.Templates; |
45 |
import gr.grnet.pithos.web.client.othersharedtree.OtherSharedTreeView; |
|
46 |
import gr.grnet.pithos.web.client.othersharedtree.OtherSharedTreeViewModel; |
|
47 | 44 |
import gr.grnet.pithos.web.client.rest.GetRequest; |
48 | 45 |
import gr.grnet.pithos.web.client.rest.RestException; |
49 | 46 |
|
50 |
import java.util.ArrayList; |
|
51 |
import java.util.HashMap; |
|
52 |
import java.util.HashSet; |
|
53 | 47 |
import java.util.Iterator; |
54 |
import java.util.List; |
|
55 |
import java.util.Map; |
|
56 |
import java.util.Set; |
|
57 | 48 |
|
58 | 49 |
import com.google.gwt.cell.client.AbstractCell; |
59 | 50 |
import com.google.gwt.cell.client.Cell; |
60 |
import com.google.gwt.cell.client.TextCell; |
|
61 | 51 |
import com.google.gwt.cell.client.ValueUpdater; |
62 |
import com.google.gwt.cell.client.Cell.Context; |
|
63 | 52 |
import com.google.gwt.core.client.GWT; |
64 | 53 |
import com.google.gwt.core.client.Scheduler; |
65 | 54 |
import com.google.gwt.event.dom.client.ContextMenuEvent; |
66 | 55 |
import com.google.gwt.http.client.Response; |
67 | 56 |
import com.google.gwt.http.client.URL; |
68 |
import com.google.gwt.safehtml.shared.SafeHtml; |
|
69 | 57 |
import com.google.gwt.safehtml.shared.SafeHtmlBuilder; |
70 |
import com.google.gwt.text.shared.SafeHtmlRenderer; |
|
71 | 58 |
import com.google.gwt.user.client.Command; |
72 | 59 |
import com.google.gwt.user.client.ui.AbstractImagePrototype; |
73 | 60 |
import com.google.gwt.view.client.ListDataProvider; |
74 |
import com.google.gwt.view.client.SelectionChangeEvent; |
|
75 |
import com.google.gwt.view.client.SelectionChangeEvent.Handler; |
|
76 | 61 |
import com.google.gwt.view.client.SingleSelectionModel; |
77 | 62 |
import com.google.gwt.view.client.TreeViewModel; |
78 | 63 |
|
... | ... | |
134 | 119 |
|
135 | 120 |
private void fetchSharedContainers(final Command callback) { |
136 | 121 |
String path = "?format=json&shared=&public="; |
137 |
GetRequest<AccountResource> getAccount = new GetRequest<AccountResource>(AccountResource.class, app.getApiPath(), app.getUsername(), path) {
|
|
122 |
GetRequest<AccountResource> getAccount = new GetRequest<AccountResource>(AccountResource.class, app.getApiPath(), app.getUserID(), path) {
|
|
138 | 123 |
@Override |
139 | 124 |
public void onSuccess(final AccountResource _result) { |
140 | 125 |
firstLevelDataProvider.getList().clear(); |
... | ... | |
165 | 150 |
app.sessionExpired(); |
166 | 151 |
} |
167 | 152 |
}; |
168 |
getAccount.setHeader("X-Auth-Token", app.getToken()); |
|
153 |
getAccount.setHeader("X-Auth-Token", app.getUserToken());
|
|
169 | 154 |
Scheduler.get().scheduleDeferred(getAccount); |
170 | 155 |
} |
171 | 156 |
|
... | ... | |
206 | 191 |
app.sessionExpired(); |
207 | 192 |
} |
208 | 193 |
}; |
209 |
getFolder.setHeader("X-Auth-Token", app.getToken()); |
|
194 |
getFolder.setHeader("X-Auth-Token", app.getUserToken());
|
|
210 | 195 |
Scheduler.get().scheduleDeferred(getFolder); |
211 | 196 |
} |
212 | 197 |
else if (callback != null) |
... | ... | |
254 | 239 |
app.sessionExpired(); |
255 | 240 |
} |
256 | 241 |
}; |
257 |
getFolder.setHeader("X-Auth-Token", app.getToken()); |
|
242 |
getFolder.setHeader("X-Auth-Token", app.getUserToken());
|
|
258 | 243 |
Scheduler.get().scheduleDeferred(getFolder); |
259 | 244 |
} |
260 | 245 |
|
Also available in: Unified diff