Finished files section of the new left pane

[pithos-web-client] / src / gr / grnet / pithos / web / client / foldertree / FolderTreeView.java

diff --git a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java
index e7c4eb8..0c95e8a 100644 (file)
--- a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java
+++ b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * Copyright 2011-2012 GRNET S.A. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
@@ -36,19 +36,30 @@
 package gr.grnet.pithos.web.client.foldertree;
 
 import gr.grnet.pithos.web.client.FolderContextMenu;
+import gr.grnet.pithos.web.client.PithosDisclosurePanel;
 import gr.grnet.pithos.web.client.TreeView;
+import gr.grnet.pithos.web.client.grouptree.GroupTreeView.Templates;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ImageResource;
 import com.google.gwt.resources.client.ImageResource.ImageOptions;
+import com.google.gwt.resources.client.ImageResource.RepeatStyle;
 import com.google.gwt.safehtml.client.SafeHtmlTemplates;
 import com.google.gwt.safehtml.shared.SafeHtml;
+import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
 import com.google.gwt.user.cellview.client.CellTree;
 import com.google.gwt.user.cellview.client.HasKeyboardSelectionPolicy.KeyboardSelectionPolicy;
 import com.google.gwt.user.cellview.client.TreeNode;
 import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.ui.AbstractImagePrototype;
 import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HasVerticalAlignment;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.Tree;
+import com.google.gwt.user.client.ui.VerticalPanel;
 
 public class FolderTreeView extends Composite implements TreeView {
 
@@ -62,18 +73,16 @@ public class FolderTreeView extends Composite implements TreeView {
             if (folder.equals(node.getChildValue(i))) {
                 return node.isChildOpen(i);
             }
-            else {
-                if (node.isChildOpen(i)) {
-                    TreeNode n = node.setChildOpen(i, true);
-                    return isFolderOpen(n, folder);
-                }
-            }
+                       if (node.isChildOpen(i)) {
+                           TreeNode n = node.setChildOpen(i, true);
+                           return isFolderOpen(n, folder);
+                       }
        }
         return false;
        }
        
     public void openFolder(Folder folder) {
-        TreeNode root = ((CellTree) getWidget()).getRootTreeNode();
+        TreeNode root = tree.getRootTreeNode();
         openFolder(root, folder);
     }
 
@@ -84,13 +93,11 @@ public class FolderTreeView extends Composite implements TreeView {
                node.setChildOpen(i, true, true);
                break;
             }
-            else {
-                if (node.isChildOpen(i)) {
-                    TreeNode n = node.setChildOpen(i, true);
-                    openFolder(n, folder);
-                    break;
-                }
-            }
+                       if (node.isChildOpen(i)) {
+                           TreeNode n = node.setChildOpen(i, true);
+                           openFolder(n, folder);
+                           break;
+                       }
        }
     }
 
@@ -114,6 +121,10 @@ public class FolderTreeView extends Composite implements TreeView {
         @Override
                @Source({"gr/grnet/pithos/web/client/PithosCellTreeBasic.css"})
         CellTree.Style cellTreeStyle();
+        
+        @Source("gr/grnet/pithos/web/client/cellTreeLoadingBasic.gif")
+        @ImageOptions(repeatStyle=RepeatStyle.None)
+        ImageResource cellTreeLoadingBasic();
     }
 
     public static interface Images extends Tree.Resources, FolderContextMenu.Images {
@@ -121,15 +132,12 @@ public class FolderTreeView extends Composite implements TreeView {
         @Source("gr/grnet/pithos/resources/home22.png")
         ImageResource home();
 
-        @Source("gr/grnet/pithos/resources/folder22.png")
+        @Source("gr/grnet/pithos/resources/2folder22.png")
         public ImageResource folderYellow();
 
         @Source("gr/grnet/pithos/resources/mimetypes/document.png")
         ImageResource document();
 
-        @Source("gr/grnet/pithos/resources/othersshared.png")
-        ImageResource othersShared();
-
         @Source("gr/grnet/pithos/resources/myshared22.png")
         ImageResource myShared();
 
@@ -152,20 +160,53 @@ public class FolderTreeView extends Composite implements TreeView {
         public SafeHtml imageSpan(String name);
     }
 
+    interface Resources extends gr.grnet.pithos.web.client.PithosDisclosurePanel.Resources {
+       @Override
+               @Source("gr/grnet/pithos/resources/home22.png")
+       ImageResource icon();
+    }
+
     private FolderTreeViewModel model;
+    
+    private CellTree tree;
 
     public FolderTreeView(FolderTreeViewModel viewModel) {
         this.model = viewModel;
+
+        VerticalPanel panel = new VerticalPanel();
+        panel.addStyleName("pithos-folderTreeSection");
+        Resources resources = GWT.create(Resources.class);
+        
+        HorizontalPanel header = new HorizontalPanel();
+        
+//        SafeHtmlBuilder sb = new SafeHtmlBuilder();
+        Image img = new Image(resources.icon());
+        header.add(img);
+        header.setCellVerticalAlignment(img, HasVerticalAlignment.ALIGN_MIDDLE);
+        header.setCellWidth(img, "32px");
+        HTML title = new HTML("My Files");
+        header.add(title);
+        header.setCellVerticalAlignment(title, HasVerticalAlignment.ALIGN_MIDDLE);
+        
+//        sb.appendHtmlConstant(AbstractImagePrototype.create(resources.icon()).getHTML());
+ //       sb.append(Templates.INSTANCE.nameSpan("My Files"));
+//        HTML header = new HTML(sb.toSafeHtml());
+        header.addStyleName("pithos-folderTreeSectionHeader");
+        panel.add(header);
+
+
         /*
          * Create the tree using the model. We use <code>null</code> as the default
          * value of the root node. The default value will be passed to
          * CustomTreeModel#getNodeInfo();
          */
         CellTree.Resources res = GWT.create(BasicResources.class);
-        CellTree tree = new CellTree(model, null, res);
+        tree = new CellTree(model, null, res);
         tree.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.ENABLED);
-
-        initWidget(tree);
+        tree.addStyleName("pithos-folderTreeSectionContent");
+        panel.add(tree);
+        
+        initWidget(panel);
     }
 
 
@@ -174,7 +215,7 @@ public class FolderTreeView extends Composite implements TreeView {
        return model.getSelection();
     }
 
-    public void updateFolder(Folder folder, boolean showfiles, Command callback) {
-        model.updateFolder(folder, showfiles, callback);
+    public void updateFolder(Folder folder, boolean showfiles, Command callback, final boolean openParent) {
+        model.updateFolder(folder, showfiles, callback, openParent);
     }
 }