Revision 0bc032bf web_client/src/gr/grnet/pithos/web/client/foldertree/Folder.java
b/web_client/src/gr/grnet/pithos/web/client/foldertree/Folder.java | ||
---|---|---|
100 | 100 |
JSONObject o = array.get(i).isObject(); |
101 | 101 |
if (o != null) { |
102 | 102 |
String contentType = unmarshallString(o, "content_type"); |
103 |
if (o.containsKey("subdir") || (contentType != null && contentType.startsWith("application/directory"))) {
|
|
103 |
if (o.containsKey("subdir") || (contentType != null && (contentType.startsWith("application/directory") || contentType.startsWith("application/folder")))) {
|
|
104 | 104 |
Folder f = new Folder(); |
105 | 105 |
f.populate(o, container); |
106 | 106 |
subfolders.add(f); |
107 | 107 |
} |
108 | 108 |
else { |
109 | 109 |
File file = new File(); |
110 |
file.populate(o); |
|
110 |
file.populate(o, container);
|
|
111 | 111 |
files.add(file); |
112 | 112 |
} |
113 | 113 |
} |
Also available in: Unified diff