fix sharing icon and popup for my shared items and others

[pithos] / src / gr / ebs / gss / client / FileList.java

diff --git a/src/gr/ebs/gss/client/FileList.java b/src/gr/ebs/gss/client/FileList.java
index 9cc053a..aef6146 100644 (file)
--- a/src/gr/ebs/gss/client/FileList.java
+++ b/src/gr/ebs/gss/client/FileList.java
@@ -723,7 +723,22 @@ public class FileList extends Composite implements ClickHandler {
         */\r
        private AbstractImagePrototype getFileIcon(FileResource file) {\r
                String mimetype = file.getContentType();\r
-               boolean shared = file.isShared();\r
+               boolean shared=false;\r
+               Folders folders = GSS.get().getFolders();\r
+               if(folders.getCurrent() != null && folders.isOthersSharedItem(folders.getCurrent())){\r
+                       DnDTreeItem otherUser = (DnDTreeItem) folders.getUserOfSharedItem(folders.getCurrent());\r
+                       if(otherUser==null)\r
+                               shared = false;\r
+                       else{\r
+                               String uname = otherUser.getOtherUserResource().getUsername();\r
+                               if(uname==null)\r
+                                       uname = ((DnDTreeItem)folders.getSharesItem()).getOthersResource().getUsernameOfUri(otherUser.getOtherUserResource().getUri());\r
+                               if(uname != null)\r
+                                       shared = file.isShared();\r
+                       }\r
+               }\r
+               else\r
+                       shared = file.isShared();\r
                if (mimetype == null)\r
                        return shared ? AbstractImagePrototype.create(images.documentShared()) : AbstractImagePrototype.create(images.document());\r
                mimetype = mimetype.toLowerCase();\r
@@ -790,9 +805,9 @@ public class FileList extends Composite implements ClickHandler {
                        updateFileCache(clearSelection);\r
                else if (GSS.get().getFolders().getCurrent() != null) {\r
                        final DnDTreeItem folderItem = (DnDTreeItem) GSS.get().getFolders().getCurrent();\r
-                       if (folderItem.getFolderResource() != null) {\r
+                       if(GSS.get().getFolders().isFileItem(folderItem) || GSS.get().getFolders().isMySharedItem(folderItem) || GSS.get().getFolders().isOthersSharedItem(folderItem)){\r
                                update(true);\r
-                               GetCommand<FolderResource> gf = new GetCommand<FolderResource>(FolderResource.class, folderItem.getFolderResource().getUri()) {\r
+                               GetCommand<FolderResource> gf = new GetCommand<FolderResource>(FolderResource.class, folderItem.getFolderResource().getUri(),folderItem.getFolderResource()) {\r
 \r
                                                @Override\r
                                                public void onComplete() {\r
@@ -804,7 +819,7 @@ public class FileList extends Composite implements ClickHandler {
                                                                        filePaths[c] = fpath + "?" + Math.random();\r
                                                                        c++;\r
                                                                }\r
-                                                               MultipleHeadCommand<FileResource> getFiles = new MultipleHeadCommand<FileResource>(FileResource.class, filePaths){\r
+                                                               MultipleHeadCommand<FileResource> getFiles = new MultipleHeadCommand<FileResource>(FileResource.class, filePaths, folderItem.getFolderResource().getFileCache()){\r
 \r
                                                                        @Override\r
                                                                        public void onComplete(){\r
@@ -815,8 +830,10 @@ public class FileList extends Composite implements ClickHandler {
                                                                                        int indexOfQuestionMark = p.lastIndexOf('?');\r
                                                                                        if(indexOfQuestionMark>0)\r
                                                                                                r.setUri(p.substring(0, indexOfQuestionMark));\r
+                                                                                       GWT.log("FETCHED:"+r.getLastModifiedSince(), null);\r
                                                                                }\r
                                                                                folderItem.getFolderResource().setFiles(result);\r
+                                                                               folderItem.getFolderResource().setFilesExpanded(true);\r
                                                                                updateFileCache(clearSelection, newFilename);\r
                                                                        }\r
 \r
@@ -847,7 +864,7 @@ public class FileList extends Composite implements ClickHandler {
                                        };\r
                                        DeferredCommand.addCommand(gf);\r
                        } else if (folderItem.getTrashResource() != null) {\r
-                               GetCommand<TrashResource> gt = new GetCommand<TrashResource>(TrashResource.class, folderItem.getTrashResource().getUri()) {\r
+                               GetCommand<TrashResource> gt = new GetCommand<TrashResource>(TrashResource.class, folderItem.getTrashResource().getUri(), null) {\r
 \r
                                        @Override\r
                                        public void onComplete() {\r
@@ -868,7 +885,7 @@ public class FileList extends Composite implements ClickHandler {
                                };\r
                                DeferredCommand.addCommand(gt);\r
                        } else if (folderItem.getSharedResource() != null) {\r
-                               GetCommand<SharedResource> gt = new GetCommand<SharedResource>(SharedResource.class, folderItem.getSharedResource().getUri()) {\r
+                               GetCommand<SharedResource> gt = new GetCommand<SharedResource>(SharedResource.class, folderItem.getSharedResource().getUri(), null) {\r
 \r
                                        @Override\r
                                        public void onComplete() {\r
@@ -884,7 +901,7 @@ public class FileList extends Composite implements ClickHandler {
                                };\r
                                DeferredCommand.addCommand(gt);\r
                        } else if (folderItem.getOtherUserResource() != null) {\r
-                               GetCommand<OtherUserResource> gt = new GetCommand<OtherUserResource>(OtherUserResource.class, folderItem.getOtherUserResource().getUri()) {\r
+                               GetCommand<OtherUserResource> gt = new GetCommand<OtherUserResource>(OtherUserResource.class, folderItem.getOtherUserResource().getUri(), null) {\r
 \r
                                        @Override\r
                                        public void onComplete() {\r