diff --git a/.classpath b/.classpath index 876662c..a0c9fe8 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -25,8 +25,8 @@ - - - - + + + + diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index 753ecc8..cf3e488 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -3,6 +3,6 @@ >>>>>>>=.r93212 eclipse.preferences.version=1 jarsExcludedFromWebInfLib= -lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/workspace/target/workspace-6.6.8-SNAPSHOT +lastWarOutDir=/Users/massi/Documents/workspace/workspace/target/workspace-6.7.0-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 2b4da6a..0aa0515 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,7 +5,10 @@ - + + uses + + uses diff --git a/pom.xml b/pom.xml index 888667c..589daca 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gcube.portlets.user workspace war - 6.6.8-SNAPSHOT + 6.7.0-SNAPSHOT gCube Workspace Portlet gcube Workspace Portlet is a portlet for users workspace management 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 634f409..19797eb 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 @@ -1238,10 +1238,27 @@ public class AppController implements SubscriberInterface { Scheduler.get().scheduleDeferred(new ScheduledCommand() { @Override public void execute() { - executeTrashOperation(WorkspaceTrashOperation.REFRESH, null); + executeTrashOperation(WorkspaceTrashOperation.REFRESH, null); + } + }); + + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override + public void execute() { + AppControllerExplorer.rpcWorkspaceService.getUserWorkspaceSize(new AsyncCallback() { + @Override + public void onFailure(Throwable caught) { } + + @Override + public void onSuccess(String size) { + rootPanel.add(new HTML("
" + size +" of private storage used
")); + } + }); + } }); + } diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java b/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java index 60615b9..d544a1e 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java @@ -45,7 +45,7 @@ public class ConstantsPortlet { public static final String SEARCH = "Search"; public static final String SAVE = "Save"; public static final String CANCEL = "Cancel"; - public static final String SEARCHBYNAME = "Search by Name"; + public static final String SEARCHBYNAME = "Search by name"; public static final String SEARCHINMESSAGE = "Search in messages"; public static final String VIEWSPACE = "";//"Filter by Space"; public static final String PREVIEW = "Preview"; diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java b/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java index 2951139..e86be7f 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java @@ -11,6 +11,7 @@ import com.google.gwt.core.client.RunAsyncCallback; import com.google.gwt.event.logical.shared.ResizeEvent; import com.google.gwt.event.logical.shared.ResizeHandler; import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.RootPanel; /** @@ -40,7 +41,7 @@ public class WorkspacePortlet implements EntryPoint { }); updateSize(); - + // showGuidedTour(); } @@ -74,6 +75,7 @@ public class WorkspacePortlet implements EntryPoint { appController.getMainPanel().setHeight(rootHeight); appController.getMainPanel().setWidth(rootWidth); + } private void showGuidedTour() { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/Breadcrumbs.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/Breadcrumbs.java index b3f0810..951e6c6 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/Breadcrumbs.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/Breadcrumbs.java @@ -17,6 +17,7 @@ import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Widget; /** @@ -67,40 +68,34 @@ public class Breadcrumbs extends Composite { } } - /** - * - */ - private void initBreadcrumb(boolean addFakeRootName) { - resetBreadcrumbs(); - if (addFakeRootName) { - NavLink navLink = new NavLink(rootName); - breadcrumbs.add(navLink); - } - } + private void resetBreadcrumbs() { - breadcrumbs.clear(); } // @UiHandler("add") public void addNavigationLink(FileModel parent) { + if (! parent.isRoot()) { + final NavLink navLink = new NavLink(parent.getName()); + navLink.setName(parent.getIdentifier()); + breadcrumbs.add(navLink); - final NavLink navLink = new NavLink(parent.getName()); - navLink.setName(parent.getIdentifier()); - breadcrumbs.add(navLink); + navLink.addClickHandler(new ClickHandler() { - navLink.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { - @Override - public void onClick(ClickEvent event) { + FileModel target = hashFileModel.get(navLink.getName()); + AppController.getEventBus().fireEvent( + new PathElementSelectedEvent(target)); - FileModel target = hashFileModel.get(navLink.getName()); - AppController.getEventBus().fireEvent( - new PathElementSelectedEvent(target)); - - } - }); + } + }); + } else { + final NavLink navLink = new NavLink(""); + breadcrumbs.add(navLink); + } } public boolean breadcrumbIsEmpty() { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtBreadcrumbPathPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtBreadcrumbPathPanel.java index 3e2cd62..e8bf374 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtBreadcrumbPathPanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtBreadcrumbPathPanel.java @@ -12,7 +12,7 @@ import com.google.gwt.user.client.ui.Composite; */ public class GxtBreadcrumbPathPanel { - private static final String ROOT_NAME = "Workspace"; + private static final String ROOT_NAME = ""; private Breadcrumbs breadCrumbs = new Breadcrumbs(ROOT_NAME); diff --git a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml index ec5c402..2ef56d3 100644 --- a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml @@ -4,9 +4,9 @@ - - + +