Added 'versioned' field in the JSON for Trash

diff --git a/src/gr/ebs/gss/client/rest/resource/TrashResource.java b/src/gr/ebs/gss/client/rest/resource/TrashResource.java
index 28cf7fc..99db929 100644 (file)
--- a/src/gr/ebs/gss/client/rest/resource/TrashResource.java
+++ b/src/gr/ebs/gss/client/rest/resource/TrashResource.java
@@ -151,6 +151,7 @@ public class TrashResource extends RestResource{
                                                String fowner = unmarshallString(fo, "owner");
                                                String fcontent = unmarshallString(fo, "content");
                                                Boolean fshared = unmarshallBoolean(fo, "shared");                                              
+                                               Boolean fversioned = unmarshallBoolean(fo, "versioned");        
                                                String fpath = unmarshallString(fo, "path");                                            
                                                fpath = URL.decodeComponent(fpath);
                                                Integer fversion = null;
@@ -179,6 +180,7 @@ public class TrashResource extends RestResource{
                                                fs.setModificationDate(fmodificationDate);
                                                fs.setContentType(fcontent);
                                                fs.setShared(fshared);
+                                               fs.setVersioned(fversioned);
                                                files.add(fs);
                                        }
                                }

diff --git a/src/gr/ebs/gss/server/rest/TrashHandler.java b/src/gr/ebs/gss/server/rest/TrashHandler.java
index 7a133f4..9930d72 100644 (file)
--- a/src/gr/ebs/gss/server/rest/TrashHandler.java
+++ b/src/gr/ebs/gss/server/rest/TrashHandler.java
@@ -117,6 +117,7 @@ public class TrashHandler extends RequestHandler {
                                        put("version", f.getVersion()).
                                        put("size", f.getFileSize()).
                                        put("shared", f.getShared()).
+                                   put("versioned",f.isVersioned()).
                                        put("content", f.getMimeType()).
                                        put("path", f.getFolder().getPath()).
                                        put("creationDate", f.getAuditInfo().getCreationDate().getTime()).