Revision 3ca8cd89 web_client/src/gr/grnet/pithos/web/client/foldertree/File.java
| b/web_client/src/gr/grnet/pithos/web/client/foldertree/File.java | ||
|---|---|---|
| 69 | 69 |
|
| 70 | 70 |
private String container; |
| 71 | 71 |
|
| 72 |
private Folder parent; |
|
| 73 |
|
|
| 72 | 74 |
public String getContentType() {
|
| 73 | 75 |
return contentType; |
| 74 | 76 |
} |
| ... | ... | |
| 137 | 139 |
return inTrash; |
| 138 | 140 |
} |
| 139 | 141 |
|
| 140 |
public void populate(JSONObject o, String container) {
|
|
| 142 |
public void populate(Folder parent, JSONObject o, String container) {
|
|
| 143 |
this.parent = parent; |
|
| 141 | 144 |
path = unmarshallString(o, "name"); |
| 142 | 145 |
if (path.contains("/"))
|
| 143 | 146 |
name = path.substring(path.lastIndexOf("/") + 1, path.length()); //strip the prefix
|
Also available in: Unified diff