When last_modified is not in valid format the date will be set to null

[pithos-web-client] / src / gr / grnet / pithos / web / client / foldertree / Resource.java

diff --git a/src/gr/grnet/pithos/web/client/foldertree/Resource.java b/src/gr/grnet/pithos/web/client/foldertree/Resource.java
index 418daae..09a29d9 100644 (file)
--- a/src/gr/grnet/pithos/web/client/foldertree/Resource.java
+++ b/src/gr/grnet/pithos/web/client/foldertree/Resource.java
@@ -35,18 +35,19 @@
 
 package gr.grnet.pithos.web.client.foldertree;
 
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.http.client.Response;
 import com.google.gwt.i18n.client.DateTimeFormat;
-import com.google.gwt.json.client.JSONArray;
+import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat;
 import com.google.gwt.json.client.JSONNumber;
 import com.google.gwt.json.client.JSONObject;
-import com.google.gwt.json.client.JSONParser;
 import com.google.gwt.json.client.JSONString;
-import com.google.gwt.json.client.JSONValue;
-import gr.grnet.pithos.web.client.rest.resource.FolderResource;
+
+import gr.grnet.pithos.web.client.SharingUsers;
+
 import java.util.Date;
 
-public class Resource {
+public abstract class Resource {
 
     protected static String unmarshallString(JSONObject obj, String key){
         if(obj.get(key) != null) {
@@ -60,7 +61,7 @@ public class Resource {
     protected static int unmarshallInt(JSONObject obj, String key){
         if(obj.get(key) != null)
             if(obj.get(key).isNumber() != null)
-                return (int) obj.get(key).isNumber().getValue();
+                return (int) obj.get(key).isNumber().doubleValue();
         return -1;
     }
 
@@ -84,7 +85,11 @@ public class Resource {
         if(obj.get(key) != null) {
             JSONString s = obj.get(key).isString();
             if (s != null)
-                return DateTimeFormat.getFormat("yyyy-MM-dd'T'HH:mm:ss").parse(s.stringValue());
+                               try {
+                                       return DateTimeFormat.getFormat(PredefinedFormat.ISO_8601).parse(s.stringValue());
+                               } catch (IllegalArgumentException e) {
+                                       GWT.log("", e);
+                               }
         }
         return null;
     }
@@ -93,16 +98,26 @@ public class Resource {
         return (new Date(ms)).toUTCString();
     }-*/;
 
-    public static <T> T createFromResponse(Class<T> aClass, Response response, T result) {
+    @SuppressWarnings("unchecked")
+       public static <T> T createFromResponse(Class<T> aClass, String owner, Response response, T result) {
+       T result1 = null;
         if (aClass.equals(AccountResource.class)) {
-            result = (T) AccountResource.createFromResponse(response);
+            result1 = (T) AccountResource.createFromResponse(owner, response, (AccountResource) result);
         }
         else if (aClass.equals(Folder.class)) {
-            result = (T) Folder.createFromResponse(response, (Folder) result);
+            result1 = (T) Folder.createFromResponse(owner, response, (Folder) result);
         }
         else if (aClass.equals(File.class)) {
-            result = (T) File.createFromResponse(response, (File) result);
+            result1 = (T) File.createFromResponse(owner, response, (File) result);
+        }
+        else if (aClass.equals(SharingUsers.class)) {
+               result1 = (T) SharingUsers.createFromResponse(response, (SharingUsers) result);
+        }
+        else if (aClass.equals(FileVersions.class)) {
+               result1 = (T) FileVersions.createFromResponse(response);
         }
-        return result;
+        return result1;
     }
+    
+    public abstract Date getLastModified();
 }