diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java index 6ac1be5..90caeae 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/WorkspaceExplorerConstants.java @@ -5,11 +5,12 @@ import org.gcube.portlets.widgets.wsexplorer.client.rpc.WorkspaceExplorerService import com.google.gwt.core.client.GWT; + /** * The Class WorkspaceExplorerConstants. * * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * Dec 9, 2015 + * Jul 11, 2017 */ public class WorkspaceExplorerConstants { public static final String SPECIAL_FOLDERS_NAME = "MySpecialFolders"; @@ -36,4 +37,6 @@ public class WorkspaceExplorerConstants { public static final String SELECT = "Select"; public static final WorkspaceExplorerServiceAsync workspaceNavigatorService = GWT.create(WorkspaceExplorerService.class); + + public static int ITEMS_PER_PAGE = 10; } diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanelPaginated.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanelPaginated.java index 6f35e80..d6891ae 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanelPaginated.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/explore/WorkspaceResourcesExplorerPanelPaginated.java @@ -5,6 +5,7 @@ package org.gcube.portlets.widgets.wsexplorer.client.explore; import java.util.List; +import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerConstants; import org.gcube.portlets.widgets.wsexplorer.client.event.BreadcrumbClickEvent; import org.gcube.portlets.widgets.wsexplorer.client.event.BreadcrumbClickEventHandler; import org.gcube.portlets.widgets.wsexplorer.client.event.ClickItemEvent; @@ -29,8 +30,8 @@ import com.google.gwt.user.client.ui.DockPanel; */ public class WorkspaceResourcesExplorerPanelPaginated extends WorkspaceResourcesExplorerPanel { + private static final int ITEMS_PER_PAGE = WorkspaceExplorerConstants.ITEMS_PER_PAGE; protected WorkspaceExplorerPaginated wsExplorer; - public static int ITEMS_PER_PAGE = 10; public static int ITEM_START_INDEX = 0; /** diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorerPaginated.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorerPaginated.java index c12017e..42baf45 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorerPaginated.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/WorkspaceExplorerPaginated.java @@ -8,8 +8,8 @@ import java.util.List; import org.gcube.portlets.widgets.wsexplorer.client.Util; import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerConstants; -import org.gcube.portlets.widgets.wsexplorer.client.view.grid.SortedCellTable; import org.gcube.portlets.widgets.wsexplorer.client.view.grid.ItemsTable.DISPLAY_FIELD; +import org.gcube.portlets.widgets.wsexplorer.client.view.grid.SortedCellTable; import org.gcube.portlets.widgets.wsexplorer.shared.FilterCriteria; import org.gcube.portlets.widgets.wsexplorer.shared.Item; import org.gcube.portlets.widgets.wsexplorer.shared.ItemType; @@ -194,8 +194,8 @@ public class WorkspaceExplorerPaginated extends WorkspaceExplorer{ // Create paging controls. SimplePager.Resources pagerResources = GWT.create(SimplePager.Resources.class); SimplePager pager = new SimplePager(TextLocation.CENTER, pagerResources, false, 0, true); - pager.setPageSize(itemsPerPage); pager.setDisplay(getCellTable()); + pager.setPageSize(itemsPerPage); vPanel.add(getCellTable()); vPanel.add(pager); diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/AbstractItemsCellTable.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/AbstractItemsCellTable.java index 721850c..6212517 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/AbstractItemsCellTable.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/AbstractItemsCellTable.java @@ -51,18 +51,18 @@ public abstract class AbstractItemsCellTable { public abstract void initTable(final SimplePager pager, final Pagination pagination); - /** * Inits the abstract table. * * @param eventBus the event bus * @param fireOnClick the fire on click * @param dataProvider the data provider + * @param pageSize the page size */ - public void initAbstractTable(HandlerManager eventBus, boolean fireOnClick, AbstractDataProvider dataProvider){ + public void initAbstractTable(HandlerManager eventBus, boolean fireOnClick, AbstractDataProvider dataProvider, int pageSize){ this.eventBus = eventBus; this.showMoreInfo = fireOnClick; - sortedCellTable = new SortedCellTable(dataProvider); + sortedCellTable = new SortedCellTable(pageSize, dataProvider); sortedCellTable.addStyleName("table-explorer"); // cellTable.getElement().getStyle().setOverflow(Overflow.HIDDEN); sortedCellTable.addStyleName("table-explorer-vertical-middle"); diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/ItemsTable.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/ItemsTable.java index fdb7e31..4bfae73 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/ItemsTable.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/ItemsTable.java @@ -11,6 +11,7 @@ import java.util.List; import java.util.Set; import org.gcube.portlets.widgets.wsexplorer.client.Util; +import org.gcube.portlets.widgets.wsexplorer.client.WorkspaceExplorerConstants; import org.gcube.portlets.widgets.wsexplorer.client.resources.WorkspaceExplorerResources; import org.gcube.portlets.widgets.wsexplorer.client.view.SelectionItem; import org.gcube.portlets.widgets.wsexplorer.client.view.gcubeitem.DialogShowGcubeItem; @@ -85,7 +86,7 @@ public class ItemsTable extends AbstractItemsCellTable implem */ public ItemsTable(HandlerManager eventBus, boolean showMoreInfo, DISPLAY_FIELD[] fields, List displayProperties, boolean showGcubeItemsInfo, DISPLAY_FIELD startSortByColumn, AbstractDataProvider dataProvider) { this.dataProvider = dataProvider; - initAbstractTable(eventBus, showMoreInfo, dataProvider); + initAbstractTable(eventBus, showMoreInfo, dataProvider, WorkspaceExplorerConstants.ITEMS_PER_PAGE); this.dataProvider.addDataDisplay(sortedCellTable); this.startSortByColumn = startSortByColumn; setDisplayFields(fields); diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/SortedCellTable.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/SortedCellTable.java index bae19ff..a9dad4a 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/SortedCellTable.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/client/view/grid/SortedCellTable.java @@ -59,12 +59,14 @@ public class SortedCellTable extends CellTable { */ private ListHandler columnSortHandler; + /** * Instantiates a new sorted cell table. * - * @param dataProv the data provider + * @param pageSize the page size + * @param dataProv the data prov */ - public SortedCellTable(AbstractDataProvider dataProv) { + public SortedCellTable(int pageSize, AbstractDataProvider dataProv) { super(1,CellTableResources.INSTANCE); this.dataProvider = dataProv;