Revision b51c628b src/gr/grnet/pithos/web/client/foldertree/Folder.java
| b/src/gr/grnet/pithos/web/client/foldertree/Folder.java | ||
|---|---|---|
| 86 | 86 |
|
| 87 | 87 |
private Set<String> tags = new LinkedHashSet<String>(); |
| 88 | 88 |
|
| 89 |
private String owner; |
|
| 90 |
|
|
| 89 | 91 |
public Folder() {};
|
| 90 | 92 |
|
| 91 | 93 |
public Folder(String name) {
|
| ... | ... | |
| 128 | 130 |
this.prefix = prefix; |
| 129 | 131 |
} |
| 130 | 132 |
|
| 131 |
public void populate(Response response) {
|
|
| 133 |
public void populate(String owner, Response response) {
|
|
| 134 |
this.owner = owner; |
|
| 132 | 135 |
String header = response.getHeader("Last-Modified");
|
| 133 | 136 |
if (header != null) |
| 134 | 137 |
lastModified = DateTimeFormat.getFormat(PredefinedFormat.RFC_2822).parse(header); |
| ... | ... | |
| 159 | 162 |
String contentType = unmarshallString(o, "content_type"); |
| 160 | 163 |
if (o.containsKey("subdir") || (contentType != null && (contentType.startsWith("application/directory") || contentType.startsWith("application/folder")))) {
|
| 161 | 164 |
Folder f = new Folder(); |
| 162 |
f.populate(this, o, container); |
|
| 165 |
f.populate(this, o, owner, container);
|
|
| 163 | 166 |
subfolders.add(f); |
| 164 | 167 |
} |
| 165 | 168 |
else if (!(o.containsKey("x_object_meta_trash") && o.get("x_object_meta_trash").isString().stringValue().equals("true"))) {
|
| 166 | 169 |
File file = new File(); |
| 167 |
file.populate(this, o, container); |
|
| 170 |
file.populate(this, o, owner, container);
|
|
| 168 | 171 |
files.add(file); |
| 169 | 172 |
} |
| 170 | 173 |
} |
| ... | ... | |
| 180 | 183 |
} |
| 181 | 184 |
} |
| 182 | 185 |
|
| 183 |
public void populate(Folder parent, JSONObject o, String aContainer) {
|
|
| 186 |
public void populate(Folder parent, JSONObject o, String owner, String aContainer) {
|
|
| 184 | 187 |
this.parent = parent; |
| 185 | 188 |
String path = null; |
| 186 | 189 |
if (o.containsKey("subdir")) {
|
| ... | ... | |
| 204 | 207 |
container = name; |
| 205 | 208 |
prefix = ""; |
| 206 | 209 |
} |
| 210 |
this.owner = owner; |
|
| 207 | 211 |
if (o.containsKey("x_object_meta_trash") && o.get("x_object_meta_trash").isString().stringValue().equals("true"))
|
| 208 | 212 |
inTrash = true; |
| 209 | 213 |
} |
| 210 | 214 |
|
| 211 |
public static Folder createFromResponse(Response response, Folder result) {
|
|
| 215 |
public static Folder createFromResponse(String owner, Response response, Folder result) {
|
|
| 212 | 216 |
Folder f = null; |
| 213 | 217 |
if (result == null) |
| 214 | 218 |
f = new Folder(); |
| 215 | 219 |
else |
| 216 | 220 |
f = result; |
| 217 | 221 |
|
| 218 |
f.populate(response); |
|
| 222 |
f.populate(owner, response);
|
|
| 219 | 223 |
return f; |
| 220 | 224 |
} |
| 221 | 225 |
|
Also available in: Unified diff