Revision 10791b56 web_client/src/gr/grnet/pithos/web/client/foldertree/Folder.java
| b/web_client/src/gr/grnet/pithos/web/client/foldertree/Folder.java | ||
|---|---|---|
| 35 | 35 |
|
| 36 | 36 |
package gr.grnet.pithos.web.client.foldertree; |
| 37 | 37 |
|
| 38 |
import java.util.Date; |
|
| 39 |
import java.util.HashMap; |
|
| 40 |
import java.util.Iterator; |
|
| 41 |
import java.util.LinkedHashSet; |
|
| 42 |
import java.util.Map; |
|
| 43 |
import java.util.Set; |
|
| 44 |
|
|
| 38 | 45 |
import com.google.gwt.http.client.Response; |
| 39 | 46 |
import com.google.gwt.i18n.client.DateTimeFormat; |
| 40 | 47 |
import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat; |
| ... | ... | |
| 42 | 49 |
import com.google.gwt.json.client.JSONObject; |
| 43 | 50 |
import com.google.gwt.json.client.JSONParser; |
| 44 | 51 |
import com.google.gwt.json.client.JSONValue; |
| 45 |
import java.util.ArrayList; |
|
| 46 |
import java.util.Date; |
|
| 47 |
import java.util.HashMap; |
|
| 48 |
import java.util.Iterator; |
|
| 49 |
import java.util.LinkedHashSet; |
|
| 50 |
import java.util.List; |
|
| 51 |
import java.util.Map; |
|
| 52 |
import java.util.Set; |
|
| 53 |
import java.util.StringTokenizer; |
|
| 54 | 52 |
|
| 55 | 53 |
public class Folder extends Resource {
|
| 56 | 54 |
/* |
| ... | ... | |
| 159 | 157 |
} |
| 160 | 158 |
} |
| 161 | 159 |
|
| 162 |
public void populate(String owner, Response response) {
|
|
| 163 |
this.owner = owner; |
|
| 160 |
public void populate(String _owner, Response response) {
|
|
| 161 |
this.owner = _owner;
|
|
| 164 | 162 |
String header = response.getHeader("Last-Modified");
|
| 165 | 163 |
if (header != null) |
| 166 | 164 |
lastModified = DateTimeFormat.getFormat(PredefinedFormat.RFC_2822).parse(header); |
| ... | ... | |
| 196 | 194 |
String contentType = unmarshallString(o, "content_type"); |
| 197 | 195 |
if (o.containsKey("subdir") || (contentType != null && (contentType.startsWith("application/directory") || contentType.startsWith("application/folder")))) {
|
| 198 | 196 |
Folder f = new Folder(); |
| 199 |
f.populate(this, o, owner, container); |
|
| 197 |
f.populate(this, o, _owner, container);
|
|
| 200 | 198 |
subfolders.add(f); |
| 201 | 199 |
} |
| 202 | 200 |
else if (!(o.containsKey("x_object_meta_trash") && o.get("x_object_meta_trash").isString().stringValue().equals("true"))) {
|
| 203 | 201 |
File file = new File(); |
| 204 |
file.populate(this, o, owner, container); |
|
| 202 |
file.populate(this, o, _owner, container);
|
|
| 205 | 203 |
files.add(file); |
| 206 | 204 |
} |
| 207 | 205 |
} |
| ... | ... | |
| 217 | 215 |
} |
| 218 | 216 |
} |
| 219 | 217 |
|
| 220 |
public void populate(Folder parent, JSONObject o, String owner, String aContainer) {
|
|
| 221 |
this.parent = parent; |
|
| 218 |
public void populate(Folder _parent, JSONObject o, String _owner, String aContainer) {
|
|
| 219 |
this.parent = _parent;
|
|
| 222 | 220 |
String path = null; |
| 223 | 221 |
if (o.containsKey("subdir")) {
|
| 224 | 222 |
path = unmarshallString(o, "subdir"); |
| ... | ... | |
| 241 | 239 |
container = name; |
| 242 | 240 |
prefix = ""; |
| 243 | 241 |
} |
| 244 |
this.owner = owner; |
|
| 242 |
this.owner = _owner;
|
|
| 245 | 243 |
if (o.containsKey("x_object_meta_trash") && o.get("x_object_meta_trash").isString().stringValue().equals("true"))
|
| 246 | 244 |
inTrash = true; |
| 247 | 245 |
|
Also available in: Unified diff