fixed display of My Shared files

diff --git a/src/gr/ebs/gss/client/FileList.java b/src/gr/ebs/gss/client/FileList.java
index 9a91a04..34e34e2 100644 (file)
--- a/src/gr/ebs/gss/client/FileList.java
+++ b/src/gr/ebs/gss/client/FileList.java
@@ -804,65 +804,68 @@ 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(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(),folderItem.getFolderResource()) {\r
-\r
-                                               @Override\r
-                                               public void onComplete() {\r
-                                                       folderItem.setUserObject(getResult());\r
-                                                       if(GSS.get().getFolders().isFileItem(folderItem)){\r
-                                                               String[] filePaths = new String[folderItem.getFolderResource().getFilePaths().size()];\r
-                                                               int c=0;\r
-                                                               for(String fpath : folderItem.getFolderResource().getFilePaths()){\r
-                                                                       filePaths[c] = fpath + "?" + Math.random();\r
-                                                                       c++;\r
-                                                               }\r
-                                                               MultipleHeadCommand<FileResource> getFiles = new MultipleHeadCommand<FileResource>(FileResource.class, filePaths, folderItem.getFolderResource().getFileCache()){\r
-\r
-                                                                       @Override\r
-                                                                       public void onComplete(){\r
-                                                                               List<FileResource> result = getResult();\r
-                                                                               //remove random from path\r
-                                                                               for(FileResource r : result){\r
-                                                                                       String p = r.getUri();\r
-                                                                                       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
+                       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(),folderItem.getFolderResource()) {\r
 \r
-                                                                       @Override\r
-                                                                       public void onError(String p, Throwable throwable) {\r
-                                                                               if(throwable instanceof RestException)\r
-                                                                                       GSS.get().displayError("Unable to retrieve file details:"+((RestException)throwable).getHttpStatusText());\r
+                                                       @Override\r
+                                                       public void onComplete() {\r
+                                                               folderItem.setUserObject(getResult());\r
+                                                               if(GSS.get().getFolders().isFileItem(folderItem)){\r
+                                                                       String[] filePaths = new String[folderItem.getFolderResource().getFilePaths().size()];\r
+                                                                       int c=0;\r
+                                                                       for(String fpath : folderItem.getFolderResource().getFilePaths()){\r
+                                                                               filePaths[c] = fpath + "?" + Math.random();\r
+                                                                               c++;\r
                                                                        }\r
+                                                                       MultipleHeadCommand<FileResource> getFiles = new MultipleHeadCommand<FileResource>(FileResource.class, filePaths, folderItem.getFolderResource().getFileCache()){\r
+\r
+                                                                               @Override\r
+                                                                               public void onComplete(){\r
+                                                                                       List<FileResource> result = getResult();\r
+                                                                                       //remove random from path\r
+                                                                                       for(FileResource r : result){\r
+                                                                                               String p = r.getUri();\r
+                                                                                               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
-                                                                       @Override\r
-                                                                       public void onError(Throwable t) {\r
-                                                                               GWT.log("", t);\r
-                                                                               GSS.get().displayError("Unable to fetch files for folder " + folderItem.getFolderResource().getName());\r
-                                                                       }\r
+                                                                               @Override\r
+                                                                               public void onError(String p, Throwable throwable) {\r
+                                                                                       if(throwable instanceof RestException)\r
+                                                                                               GSS.get().displayError("Unable to retrieve file details:"+((RestException)throwable).getHttpStatusText());\r
+                                                                               }\r
+\r
+                                                                               @Override\r
+                                                                               public void onError(Throwable t) {\r
+                                                                                       GWT.log("", t);\r
+                                                                                       GSS.get().displayError("Unable to fetch files for folder " + folderItem.getFolderResource().getName());\r
+                                                                               }\r
 \r
-                                                               };\r
-                                                               DeferredCommand.addCommand(getFiles);\r
+                                                                       };\r
+                                                                       DeferredCommand.addCommand(getFiles);\r
+                                                               }\r
+                                                               else\r
+                                                                       updateFileCache(clearSelection, newFilename);\r
                                                        }\r
-                                                       else\r
-                                                               updateFileCache(clearSelection, newFilename);\r
-                                               }\r
 \r
-                                               @Override\r
-                                               public void onError(Throwable t) {\r
-                                                       GWT.log("", t);\r
-                                                       GSS.get().displayError("Unable to fetch folder " + folderItem.getFolderResource().getName());\r
-                                               }\r
-                                       };\r
-                                       DeferredCommand.addCommand(gf);\r
-                       } else if (folderItem.getTrashResource() != null) {\r
+                                                       @Override\r
+                                                       public void onError(Throwable t) {\r
+                                                               GWT.log("", t);\r
+                                                               GSS.get().displayError("Unable to fetch folder " + folderItem.getFolderResource().getName());\r
+                                                       }\r
+                                               };\r
+                                               DeferredCommand.addCommand(gf);\r
+                               }\r
+                       }\r
+                       else if (folderItem.getTrashResource() != null) {\r
                                GetCommand<TrashResource> gt = new GetCommand<TrashResource>(TrashResource.class, folderItem.getTrashResource().getUri(), null) {\r
 \r
                                        @Override\r