Updated copyright
[pithos-web-client] / src / gr / grnet / pithos / web / client / Pithos.java
index c8e8b47..ac81537 100644 (file)
@@ -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
@@ -34,8 +34,6 @@
  */
 package gr.grnet.pithos.web.client;
 
-import gr.grnet.pithos.web.client.commands.NewFolderCommand;
-import gr.grnet.pithos.web.client.commands.PropertiesCommand;
 import gr.grnet.pithos.web.client.commands.UploadFileCommand;
 import gr.grnet.pithos.web.client.foldertree.AccountResource;
 import gr.grnet.pithos.web.client.foldertree.File;
@@ -56,11 +54,8 @@ import gr.grnet.pithos.web.client.rest.HeadRequest;
 import gr.grnet.pithos.web.client.rest.PutRequest;
 import gr.grnet.pithos.web.client.rest.RestException;
 import gr.grnet.pithos.web.client.tagtree.Tag;
-import gr.grnet.pithos.web.client.tagtree.TagTreeView;
-import gr.grnet.pithos.web.client.tagtree.TagTreeViewModel;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -70,7 +65,6 @@ import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
-import com.google.gwt.dom.client.Style.Display;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.logical.shared.ResizeEvent;
@@ -95,17 +89,13 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.AbstractImagePrototype;
-import com.google.gwt.user.client.ui.Anchor;
 import com.google.gwt.user.client.ui.Button;
 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.HTMLPanel;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HasVerticalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.HorizontalSplitPanel;
-import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.view.client.SelectionChangeEvent;
@@ -276,10 +266,8 @@ public class Pithos implements EntryPoint, ResizeHandler {
     
     private HTML numOfFiles;
     
-    private Anchor refreshButton;
-
-    private Anchor toolsButton;
-
+    private Toolbar toolbar;
+    
        @Override
        public void onModuleLoad() {
                if (parseUserCredentials())
@@ -303,6 +291,11 @@ public class Pithos implements EntryPoint, ResizeHandler {
                outer.setCellHorizontalAlignment(topPanel, HasHorizontalAlignment.ALIGN_CENTER);
         }
         
+        messagePanel.setVisible(false);
+        outer.add(messagePanel);
+        outer.setCellHorizontalAlignment(messagePanel, HasHorizontalAlignment.ALIGN_CENTER);
+        outer.setCellVerticalAlignment(messagePanel, HasVerticalAlignment.ALIGN_MIDDLE);
+
         HorizontalPanel header = new HorizontalPanel();
         header.addStyleName("pithos-header");
         header.setWidth(contentWidth);
@@ -310,8 +303,9 @@ public class Pithos implements EntryPoint, ResizeHandler {
                header.addStyleName("pithos-header-noframe");
         upload = new Button("Upload File", new ClickHandler() {
             @Override
-            public void onClick(@SuppressWarnings("unused") ClickEvent event) {
-                new UploadFileCommand(Pithos.this, null, getSelection()).execute();
+            public void onClick(ClickEvent event) {
+               if (getSelection() != null)
+                       new UploadFileCommand(Pithos.this, null, getSelection()).execute();
             }
         });
         upload.addStyleName("pithos-uploadButton");
@@ -319,98 +313,10 @@ public class Pithos implements EntryPoint, ResizeHandler {
         header.setCellHorizontalAlignment(upload, HasHorizontalAlignment.ALIGN_LEFT);
         header.setCellVerticalAlignment(upload, HasVerticalAlignment.ALIGN_MIDDLE);
 
-        messagePanel.setVisible(false);
-        header.add(messagePanel);
-        header.setCellHorizontalAlignment(messagePanel, HasHorizontalAlignment.ALIGN_CENTER);
-        header.setCellVerticalAlignment(messagePanel, HasVerticalAlignment.ALIGN_MIDDLE);
-
-        FlowPanel toolbar = new FlowPanel();
-        toolbar.getElement().setId("toolbar");
-        toolbar.addStyleName("clearfix");
-        toolbar.getElement().getStyle().setDisplay(Display.BLOCK);
-
-        Anchor newFolderButton = new Anchor("<span class='ico'></span><span class='title'>New folder</span>", true);
-        newFolderButton.getElement().setId("newfolder-button");
-        newFolderButton.addStyleName("pithos-toolbarItem");
-        newFolderButton.addClickHandler(new ClickHandler() {
-                       
-                       @Override
-                       public void onClick(@SuppressWarnings("unused") ClickEvent event) {
-                               Folder folder = getSelectedTree().getSelection();
-                               if (folder != null) {
-                               Boolean[] permissions = folder.getPermissions().get(getUsername());
-                               boolean canWrite = folder.getOwner().equals(getUsername()) || (permissions!= null && permissions[1] != null && permissions[1]);
-                               
-                               if (!folder.isInTrash() && canWrite)
-                                       new NewFolderCommand(Pithos.this, null, folder).execute();
-                               }
-                       }
-               });
-        toolbar.add(newFolderButton);
-
-        Anchor shareFolderButton = new Anchor("<span class='ico'></span><span class='title'>Share folder</span>", true);
-        shareFolderButton.getElement().setId("sharefolder-button");
-        shareFolderButton.addStyleName("pithos-toolbarItem");
-        shareFolderButton.addClickHandler(new ClickHandler() {
-                       
-                       @Override
-                       public void onClick(@SuppressWarnings("unused") ClickEvent event) {
-                               Folder folder = getSelectedTree().getSelection();
-                               if (folder != null) {
-                               Boolean[] permissions = folder.getPermissions().get(getUsername());
-                               boolean canWrite = folder.getOwner().equals(getUsername()) || (permissions!= null && permissions[1] != null && permissions[1]);
-                               boolean isFolderTreeSelected = selectedTree.equals(getFolderTreeView());
-                               
-                               if (!folder.isInTrash() && canWrite && isFolderTreeSelected && !folder.isContainer())
-                                       new PropertiesCommand(Pithos.this, null, folder, 1).execute();
-                               }
-                       }
-               });
-        toolbar.add(shareFolderButton);
-
-        refreshButton = new Anchor("<span class='ico'></span><span class='title'>Refresh</span>", true);
-        refreshButton.getElement().setId("refresh-button");
-        refreshButton.addStyleName("pithos-toolbarItem");
-        refreshButton.addClickHandler(new ClickHandler() {
-                       
-                       @Override
-                       public void onClick(@SuppressWarnings("unused") ClickEvent event) {
-                       boolean isFolderTreeSelected = selectedTree.equals(getFolderTreeView());
-                       boolean otherSharedTreeSelected = selectedTree.equals(getOtherSharedTreeView());
-                       Folder folder = getSelectedTree().getSelection();
-                       
-                       if (folder != null && (isFolderTreeSelected || otherSharedTreeSelected))
-                               updateFolder(folder, true, new Command() {
-                                       
-                                       @Override
-                                       public void execute() {
-                                               updateStatistics();
-                                       }
-                               });
-                       }
-               });
-        toolbar.add(refreshButton);
-
-        toolsButton = new Anchor("<span class='ico'></span><span class='title'>More...</span>", true);
-        toolsButton.getElement().setId("tools-button");
-        toolsButton.addStyleName("pithos-toolbarItem");
-        toolsButton.addClickHandler(new ClickHandler() {
-                       
-                       @Override
-                       public void onClick(ClickEvent event) {
-                ToolsMenu menu = new ToolsMenu(Pithos.this, images, getSelectedTree(), getSelectedTree().getSelection(), getFileList().getSelectedFiles());
-                if (!menu.isEmpty()) {
-                           menu.setPopupPosition(event.getClientX(), event.getClientY());
-                           menu.show();
-                }
-                       }
-               });
-        toolbar.add(toolsButton);
-  
+        toolbar = new Toolbar(this);
         header.add(toolbar);
         header.setCellHorizontalAlignment(toolbar, HasHorizontalAlignment.ALIGN_CENTER);
         header.setCellVerticalAlignment(toolbar, HasVerticalAlignment.ALIGN_MIDDLE);
-//        header.setCellWidth(toolbar, "40px");
         
         HorizontalPanel folderStatistics = new HorizontalPanel();
         folderStatistics.addStyleName("pithos-folderStatistics");
@@ -433,7 +339,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
         folderTreeSelectionModel = new SingleSelectionModel<Folder>();
         folderTreeSelectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() {
             @Override
-            public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) {
+            public void onSelectionChange(SelectionChangeEvent event) {
                 if (folderTreeSelectionModel.getSelectedObject() != null) {
                     deselectOthers(folderTreeView, folderTreeSelectionModel);
                     applyPermissions(folderTreeSelectionModel.getSelectedObject());
@@ -446,6 +352,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
                                }
                        });
                 }
+                showRelevantToolbarButtons();
             }
         });
         selectionModels.add(folderTreeSelectionModel);
@@ -614,7 +521,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
             String path = file.getUri() + "?format=json";
             GetRequest<File> getFile = new GetRequest<File>(File.class, getApiPath(), username, path, file) {
                 @Override
-                public void onSuccess(@SuppressWarnings("unused") File _result) {
+                public void onSuccess(File _result) {
                     fetchFile(iter, files);
                 }
 
@@ -676,8 +583,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
         * Redirect the user to the login page for authentication.
         */
        protected void authenticateUser() {
-               Configuration conf = (Configuration) GWT.create(Configuration.class);
-        Window.Location.assign(conf.loginUrl() + "?next=" + Window.Location.getHref());
+        Window.Location.assign("/im/login");
        }
 
        protected void fetchAccount(final Command callback) {
@@ -714,7 +620,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
        HeadRequest<AccountResource> headAccount = new HeadRequest<AccountResource>(AccountResource.class, getApiPath(), username, "", account) {
 
                        @Override
-                       public void onSuccess(@SuppressWarnings("unused") AccountResource _result) {
+                       public void onSuccess(AccountResource _result) {
                                showStatistics();
                        }
 
@@ -748,7 +654,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
         String path = "/" + Pithos.HOME_CONTAINER;
         PutRequest createPithos = new PutRequest(getApiPath(), getUsername(), path) {
             @Override
-            public void onSuccess(@SuppressWarnings("unused") Resource result) {
+            public void onSuccess(Resource result) {
                if (!_account.hasTrashContainer())
                        createTrashContainer(callback);
                else
@@ -778,7 +684,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
         String path = "/" + Pithos.TRASH_CONTAINER;
         PutRequest createPithos = new PutRequest(getApiPath(), getUsername(), path) {
             @Override
-            public void onSuccess(@SuppressWarnings("unused") Resource result) {
+            public void onSuccess(Resource result) {
                        fetchAccount(callback);
             }
 
@@ -932,7 +838,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
         try {
             builder.sendRequest("", new RequestCallback() {
                 @Override
-                public void onResponseReceived(@SuppressWarnings("unused") Request request, Response response) {
+                public void onResponseReceived(Request request, Response response) {
                     if (response.getStatusCode() == Response.SC_OK) {
                         JSONValue json = JSONParser.parseStrict(response.getText());
                         JSONArray array = json.isArray();
@@ -944,7 +850,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
                 }
 
                 @Override
-                public void onError(@SuppressWarnings("unused") Request request, Throwable exception) {
+                public void onError(Request request, Throwable exception) {
                        setError(exception);
                     displayError("System error unable to delete folder: " + exception.getMessage());
                 }
@@ -960,9 +866,9 @@ public class Pithos implements EntryPoint, ResizeHandler {
             if (o != null && !o.containsKey("subdir")) {
                 JSONString name = o.get("name").isString();
                 String path = "/" + folder.getContainer() + "/" + name.stringValue();
-                DeleteRequest delete = new DeleteRequest(getApiPath(), folder.getOwner(), path) {
+                DeleteRequest delete = new DeleteRequest(getApiPath(), folder.getOwner(), URL.encode(path)) {
                     @Override
-                    public void onSuccess(@SuppressWarnings("unused") Resource result) {
+                    public void onSuccess(Resource result) {
                         deleteObject(folder, i + 1, array);
                     }
 
@@ -990,7 +896,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
                 try {
                     builder.sendRequest("", new RequestCallback() {
                         @Override
-                        public void onResponseReceived(@SuppressWarnings("unused") Request request, Response response) {
+                        public void onResponseReceived(Request request, Response response) {
                             if (response.getStatusCode() == Response.SC_OK) {
                                 JSONValue json = JSONParser.parseStrict(response.getText());
                                 JSONArray array2 = json.isArray();
@@ -1005,7 +911,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
                         }
 
                         @Override
-                        public void onError(@SuppressWarnings("unused") Request request, Throwable exception) {
+                        public void onError(Request request, Throwable exception) {
                                setError(exception);
                             displayError("System error unable to delete folder: " + exception.getMessage());
                         }
@@ -1017,9 +923,9 @@ public class Pithos implements EntryPoint, ResizeHandler {
         }
         else {
             String path = folder.getUri();
-            DeleteRequest deleteFolder = new DeleteRequest(getApiPath(), getUsername(), path) {
+            DeleteRequest deleteFolder = new DeleteRequest(getApiPath(), getUsername(), URL.encode(path)) {
                 @Override
-                public void onSuccess(@SuppressWarnings("unused") Resource result) {
+                public void onSuccess(Resource result) {
                     updateFolder(folder.getParent(), true, new Command() {
                                                
                                                @Override
@@ -1063,7 +969,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
             String path = targetUri + "/" + file.getName();
             PutRequest copyFile = new PutRequest(getApiPath(), targetUsername, path) {
                 @Override
-                public void onSuccess(@SuppressWarnings("unused") Resource result) {
+                public void onSuccess(Resource result) {
                     copyFiles(iter, targetUsername, targetUri, callback);
                 }
 
@@ -1115,7 +1021,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
         String path = targetUri + "/" + f.getName();
         PutRequest createFolder = new PutRequest(getApiPath(), targetUsername, path) {
             @Override
-            public void onSuccess(@SuppressWarnings("unused") Resource result) {
+            public void onSuccess(Resource result) {
                GetRequest<Folder> getFolder = new GetRequest<Folder>(Folder.class, getApiPath(), f.getOwner(), "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + URL.encodeQueryString(f.getPrefix()), f) {
 
                                        @Override
@@ -1228,12 +1134,13 @@ public class Pithos implements EntryPoint, ResizeHandler {
                mysharedTreeSelectionModel = new SingleSelectionModel<Folder>();
                mysharedTreeSelectionModel.addSelectionChangeHandler(new Handler() {
                    @Override
-                   public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) {
+                   public void onSelectionChange(SelectionChangeEvent event) {
                        if (mysharedTreeSelectionModel.getSelectedObject() != null) {
                            deselectOthers(mysharedTreeView, mysharedTreeSelectionModel);
                            upload.setEnabled(false);
                            updateSharedFolder(mysharedTreeSelectionModel.getSelectedObject(), true);
                        }
+                       showRelevantToolbarButtons();
                    }
                });
                selectionModels.add(mysharedTreeSelectionModel);
@@ -1254,13 +1161,14 @@ public class Pithos implements EntryPoint, ResizeHandler {
                otherSharedTreeSelectionModel = new SingleSelectionModel<Folder>();
                otherSharedTreeSelectionModel.addSelectionChangeHandler(new Handler() {
                    @Override
-                   public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) {
+                   public void onSelectionChange(SelectionChangeEvent event) {
                        if (otherSharedTreeSelectionModel.getSelectedObject() != null) {
                            deselectOthers(otherSharedTreeView, otherSharedTreeSelectionModel);
                            otherSharedTreeView.addStyleName("cellTreeWidget-selectedTree");
                            applyPermissions(otherSharedTreeSelectionModel.getSelectedObject());
                            updateOtherSharedFolder(otherSharedTreeSelectionModel.getSelectedObject(), true);
                        }
+                       showRelevantToolbarButtons();
                    }
                });
                selectionModels.add(otherSharedTreeSelectionModel);
@@ -1283,7 +1191,7 @@ public class Pithos implements EntryPoint, ResizeHandler {
                for (String s: Cookies.getCookieNames())
                        if (s.startsWith(conf.shibSessionCookiePrefix()))
                                Cookies.removeCookie(s, "/");
-               Window.Location.assign(Window.Location.getPath());
+               Window.Location.assign("/im/logout");
        }
 
        public String getErrorData() {
@@ -1295,4 +1203,8 @@ public class Pithos implements EntryPoint, ResizeHandler {
        public void setError(Throwable t) {
                error = t;
        }
+       
+       public void showRelevantToolbarButtons() {
+               toolbar.showRelevantButtons();
+       }
 }