when a folder is deleted, select parent folder and update file list contents

diff --git a/gss/src/gr/ebs/gss/client/DeleteFolderDialog.java b/gss/src/gr/ebs/gss/client/DeleteFolderDialog.java
index 8724046..bb9164a 100644 (file)
--- a/gss/src/gr/ebs/gss/client/DeleteFolderDialog.java
+++ b/gss/src/gr/ebs/gss/client/DeleteFolderDialog.java
@@ -111,7 +111,11 @@ public class DeleteFolderDialog extends DialogBox {
                        @Override\r
                        public void onComplete() {\r
                                TreeItem curFolder = GSS.get().getFolders().getCurrent();\r
-                               GSS.get().getFolders().updateFolder((DnDTreeItem) curFolder.getParentItem());\r
+                               if(curFolder.getParentItem() != null){\r
+                                       GSS.get().getFolders().select(curFolder.getParentItem());\r
+                                       GSS.get().getFolders().updateFolder((DnDTreeItem) curFolder.getParentItem());\r
+                               }\r
+                               GSS.get().showFileList(true);\r
                        }\r
 \r
                        @Override\r

diff --git a/gss/src/gr/ebs/gss/client/commands/ToTrashCommand.java b/gss/src/gr/ebs/gss/client/commands/ToTrashCommand.java
index 53da7c4..c59a41c 100644 (file)
--- a/gss/src/gr/ebs/gss/client/commands/ToTrashCommand.java
+++ b/gss/src/gr/ebs/gss/client/commands/ToTrashCommand.java
@@ -62,8 +62,12 @@ public class ToTrashCommand implements Command{
                                @Override
                                public void onComplete() {
                                        TreeItem folder = GSS.get().getFolders().getCurrent();
-                                       GSS.get().getFolders().updateFolder((DnDTreeItem) folder.getParentItem());
+                                       if(folder.getParentItem() != null){
+                                               GSS.get().getFolders().select(folder.getParentItem());
+                                               GSS.get().getFolders().updateFolder((DnDTreeItem) folder.getParentItem());
+                                       }
                                        GSS.get().getFolders().update(GSS.get().getFolders().getTrashItem());
+                                       GSS.get().showFileList(true);
                                }
 
                                @Override