Fixed error in selection models of my shared and others' shared

diff --git a/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java b/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java
index d2640fd..5cddcf6 100644 (file)
--- a/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java
+++ b/src/gr/grnet/pithos/web/client/mysharedtree/MysharedTreeViewModel.java
@@ -134,7 +134,7 @@ public class MysharedTreeViewModel implements TreeViewModel {
                                        app.showRelevantToolbarButtons();
                     }
                                else {
-                                       if (app.getSelectedTree().equals(app.getMySharedTreeView()))
+                                       if (app.getSelectedTree().equals(app.getMySharedTreeView()) && app.getMySharedTreeView().getSelection() == null)
                                                app.setSelectedTree(null);
                                        if (app.getSelectedTree() == null)
                                                app.showRelevantToolbarButtons();

diff --git a/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java b/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java
index a958003..8caf848 100644 (file)
--- a/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java
+++ b/src/gr/grnet/pithos/web/client/othersharedtree/OtherSharedTreeViewModel.java
@@ -136,7 +136,7 @@ public class OtherSharedTreeViewModel implements TreeViewModel {
                                        app.showRelevantToolbarButtons();
                     }
                                else {
-                                       if (app.getSelectedTree().equals(app.getOtherSharedTreeView()))
+                                       if (app.getSelectedTree().equals(app.getOtherSharedTreeView()) && app.getOtherSharedTreeView().getSelection() == null)
                                                app.setSelectedTree(null);
                                        if (app.getSelectedTree() == null)
                                                app.showRelevantToolbarButtons();
@@ -179,7 +179,7 @@ public class OtherSharedTreeViewModel implements TreeViewModel {
                                                app.showRelevantToolbarButtons();
                            }
                                        else {
-                                               if (app.getSelectedTree().equals(app.getOtherSharedTreeView()))
+                                               if (app.getSelectedTree().equals(app.getOtherSharedTreeView()) && app.getOtherSharedTreeView().getSelection() == null)
                                                        app.setSelectedTree(null);
                                                if (app.getSelectedTree() == null)
                                                        app.showRelevantToolbarButtons();