Fixed initialization error when sections are empty (issue #2345)

diff --git a/src/gr/grnet/pithos/web/client/grouptree/GroupTreeViewModel.java b/src/gr/grnet/pithos/web/client/grouptree/GroupTreeViewModel.java
index b76bc94..491c802 100644 (file)
--- a/src/gr/grnet/pithos/web/client/grouptree/GroupTreeViewModel.java
+++ b/src/gr/grnet/pithos/web/client/grouptree/GroupTreeViewModel.java
@@ -176,7 +176,7 @@ public class GroupTreeViewModel implements TreeViewModel {
                return ((Group) o).getMembers().isEmpty();
         else if (o != null)
                return true;
-        return false;
+        return app.getAccount().getGroups().isEmpty();
     }
        
        public void updateGroupNode(Group group) {

diff --git a/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java b/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java
index 6e5c005..790ee2d 100644 (file)
--- a/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java
+++ b/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java
@@ -144,7 +144,7 @@ public class MysharedTreeViewModel implements TreeViewModel {
        @Override
     public boolean isLeaf(Object o) {
                if (o == null)
-                       return false;
+                       return firstLevelDataProvider.getList().isEmpty();
                return true;
     }
        

diff --git a/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java b/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java
index 291287a..5e1ced8 100644 (file)
--- a/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java
+++ b/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java
@@ -74,7 +74,6 @@ import com.google.gwt.view.client.TreeViewModel;
 
 public class OtherSharedTreeViewModel implements TreeViewModel {
 
-       private static final String treeTitle = "Shared to me";
     protected Pithos app;
 
     private Cell<Folder> folderCell = new AbstractCell<Folder>(ContextMenuEvent.getType().getName()) {
@@ -212,14 +211,12 @@ public class OtherSharedTreeViewModel implements TreeViewModel {
        @Override
     public boolean isLeaf(Object o) {
                if (o == null)
-                       return false;
+                       return userLevelDataProvider.getList().isEmpty();
                else if (o instanceof Folder) {
             Folder f = (Folder) o;
             return f.getSubfolders().isEmpty();
         }
                else {
-                       if (o.equals(treeTitle))
-                               return userLevelDataProvider.getList().isEmpty();
                        ListDataProvider<Folder> dp = userDataProviderMap.get(o);
                        if (dp != null)
                                return dp.getList().isEmpty();