[LMS-1122] fixed label with a number of all items in a table

SVN: 12769

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java

@@ -127,7 +127,7 @@ public abstract class AbstractExternalDataGrid
                                         IBrowserGridActionInvoker invoker)
                                 {
                                     return new DataSetUploadConfirmationDialog(dataSets,
-                                            getSelectedAndDisplayedItemsAction(), getCount(),
+                                            getSelectedAndDisplayedItemsAction(), getTotalCount(),
                                             viewContext);
                                 }
                             });
@@ -278,7 +278,7 @@ public abstract class AbstractExternalDataGrid
                 public SelectedAndDisplayedItems execute()
                 {
                     return new SelectedAndDisplayedItems(getSelectedBaseObjects(),
-                            createTableExportCriteria(), getCount());
+                            createTableExportCriteria(), getTotalCount());
                 }
             };
     }

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserGrid.java

@@ -349,7 +349,7 @@ public class ExperimentBrowserGrid extends
                 public DisplayedAndSelectedExperiments execute()
                 {
                     return new DisplayedAndSelectedExperiments(getSelectedBaseObjects(),
-                            createTableExportCriteria(), getCount());
+                            createTableExportCriteria(), getTotalCount());
                 }
             };
     }

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java

@@ -194,6 +194,9 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
     // result set key of the last refreshed data
     private String resultSetKey;
 
+    /** the number of all objects cached in the browser */
+    private int totalCount;
+
     private IDataRefreshCallback refreshCallback;
 
     protected AbstractBrowserGrid(final IViewContext<ICommonClientServiceAsync> viewContext,
@@ -644,6 +647,7 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
             // save the key of the result, later we can refer to the result in the cache using this
             // key
             saveCacheKey(result.getResultSetKey());
+            totalCount = result.getTotalLength();
             // convert the result to the model data for the grid control
             final List<M> models = createModels(result.getList());
             final PagingLoadResult<M> loadResult =
@@ -1238,9 +1242,12 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
     }
 
     /** @return the number of all objects cached in the browser */
-    public int getCount()
+    public int getTotalCount()
     {
-        return grid.getStore().getCount(); // FIXME takes only displayed items count
+        // NOTE: Maybe there is a better way to get this value without keeping it on field variable.
+        // Bottom toolbar displays it so there has to be access to this, but e.g.
+        // grid.getStore().getCount() returns only number of items displayed on the current page.
+        return totalCount;
     }
 
     private void refreshColumnsSettings()
@@ -1559,7 +1566,7 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
         {
             // > 0 entity selected - show dialog with all/selected radio
             new ShowRelatedDatasetsDialog(viewContext, selectedEntities, displayedEntities, browser
-                    .getCount()).show();
+                    .getTotalCount()).show();
         }
     }
 }

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java

@@ -648,7 +648,7 @@ public class SampleBrowserGrid extends
                 public DisplayedAndSelectedSamples execute()
                 {
                     return new DisplayedAndSelectedSamples(getSelectedBaseObjects(),
-                            createTableExportCriteria(), getCount());
+                            createTableExportCriteria(), getTotalCount());
                 }
             };
     }