From b1dc73351052beaa92c98f6b7481950dceb8fa24 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 31 Oct 2014 16:28:19 +0000 Subject: [PATCH] latest version to integrate workspace quote git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@101326 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/client/AppController.java | 49 +++++++++++++++---- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java index 4f8fc0f..e2d7bbc 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppController.java @@ -108,6 +108,7 @@ import org.gcube.portlets.user.workspace.shared.SessionExpiredException; import org.gcube.portlets.user.workspace.shared.TrashContent; import org.gcube.portlets.user.workspace.shared.TrashOperationContent; import org.gcube.portlets.user.workspace.shared.WorkspaceTrashOperation; +import org.gcube.portlets.user.workspace.shared.WorkspaceUserQuote; import org.gcube.portlets.widgets.sessionchecker.client.CheckSession; import org.gcube.portlets.widgets.wsmail.client.forms.MailForm; @@ -1265,8 +1266,20 @@ public class AppController implements SubscriberInterface { rootPanel.add(htmlWorkspaceSize); } - private void setWorkspaceSize(String size){ - String html = "
" + size +" of storage space used
"; + private void setWorkspaceUserQuotes(String size, long totalItems){ + String msg; + + if(totalItems<=0){ + msg = "No items"; + }else if(totalItems==1){ + msg = totalItems + " item"; + }else { + msg = totalItems + " items"; + } + + msg+= ". "+size +" of storage space used"; + + String html = "
" + msg +"
"; htmlWorkspaceSize.setHTML(html); } @@ -1658,7 +1671,7 @@ public class AppController implements SubscriberInterface { if(folderId!=null && !folderId.isEmpty()){ HashMap params = new HashMap(1); params.put(ConstantsExplorer.GET_ITEMID_PARAMETER, folderId); - logger.log(Level.INFO, "show logut with parameter is: "+folderId); + logger.log(Level.INFO, "show logout with parameter is: "+folderId); CheckSession.showLogoutDialog(params); }else{ logger.log(Level.INFO, "show logut without parameters"); @@ -1793,8 +1806,10 @@ public class AppController implements SubscriberInterface { } }); + + break; } - break; + default:{ @@ -1847,6 +1862,10 @@ public class AppController implements SubscriberInterface { public void changedFileModelId(String oldId, String newId) { } + + private void setVisibleUserQuote(boolean bool){ + htmlWorkspaceSize.setVisible(bool); + } /* (non-Javadoc) @@ -1859,14 +1878,24 @@ public class AppController implements SubscriberInterface { @Override public void run() { - AppControllerExplorer.rpcWorkspaceService.getUserWorkspaceSize(new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { } + + AppControllerExplorer.rpcWorkspaceService.getUserWorkspaceQuote(new AsyncCallback() { @Override - public void onSuccess(String size) { - GWT.log("Updating worskpace size as: "+size); - setWorkspaceSize(size); + public void onFailure(Throwable arg0) { + GWT.log("Failed get worskpace quote as", arg0); + setVisibleUserQuote(false); + } + + @Override + public void onSuccess(WorkspaceUserQuote wsquote) { + + if(wsquote==null) + setVisibleUserQuote(false); + else{ + GWT.log("Updating worskpace quote as: "+wsquote); + setWorkspaceUserQuotes(wsquote.getDiskSpaceFormatted(), wsquote.getTotalItems()); + } } });