[LMS-621] GUI framework: refresh() in onLoad()

SVN: 8825

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/GroupSelectionWidget.java

@@ -43,14 +43,15 @@ class GroupSelectionWidget extends ExtendedComboBox<GroupModel>
 {
     final class ListGroupsCallback extends AbstractAsyncCallback<List<Group>>
     {
-        ListGroupsCallback(IViewContext<?> viewContext)
+        ListGroupsCallback(final IViewContext<?> viewContext)
         {
             super(viewContext);
         }
 
         @Override
-        protected void process(List<Group> result)
+        protected void process(final List<Group> result)
         {
+            groupStore.removeAll();
             groupStore.add(convert(result));
             if (groupStore.getCount() > 0)
             {
@@ -67,9 +68,9 @@ class GroupSelectionWidget extends ExtendedComboBox<GroupModel>
 
     private final GenericViewContext viewContext;
 
-    private ListStore<GroupModel> groupStore;
+    private final ListStore<GroupModel> groupStore;
 
-    public GroupSelectionWidget(GenericViewContext viewContext)
+    public GroupSelectionWidget(final GenericViewContext viewContext)
     {
 
         this.viewContext = viewContext;
@@ -83,7 +84,7 @@ class GroupSelectionWidget extends ExtendedComboBox<GroupModel>
         setStore(groupStore);
         addListener(Events.OnClick, new Listener<BaseEvent>()
             {
-                public void handleEvent(BaseEvent be)
+                public void handleEvent(final BaseEvent be)
                 {
                     expand();
                 }
@@ -103,15 +104,22 @@ class GroupSelectionWidget extends ExtendedComboBox<GroupModel>
         }
     }
 
+    @Override
+    protected void onLoad()
+    {
+        super.onLoad();
+        refresh();
+    }
+
     void refresh()
     {
         viewContext.getService().listGroups(null, new ListGroupsCallback(viewContext));
     }
 
-    List<GroupModel> convert(List<Group> groups)
+    List<GroupModel> convert(final List<Group> groups)
     {
-        List<GroupModel> result = new ArrayList<GroupModel>();
-        for (Group g : groups)
+        final List<GroupModel> result = new ArrayList<GroupModel>();
+        for (final Group g : groups)
         {
             result.add(new GroupModel(g));
         }

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleBrowserToolbar.java

@@ -105,7 +105,6 @@ class SampleBrowserToolbar extends ToolBar
         addSelectGroupListeners();
         addIncludeInstanceListeners();
         addIncludeGroupListeners();
-        refresh();
     }
 
     private void addIncludeGroupListeners()
@@ -285,11 +284,16 @@ class SampleBrowserToolbar extends ToolBar
         return error;
     }
 
+    @Override
+    protected void onLoad()
+    {
+        super.onLoad();
+        refresh();
+    }
+
     public void refresh()
     {
         display();
-        selectSampleTypeCombo.refresh();
-        selectGroupCombo.refresh();
     }
 
 }
\ No newline at end of file

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleTypeSelectionWidget.java

@@ -43,14 +43,15 @@ class SampleTypeSelectionWidget extends ExtendedComboBox<SampleTypeModel>
 
     final class ListSampleTypesCallback extends AbstractAsyncCallback<List<SampleType>>
     {
-        ListSampleTypesCallback(IViewContext<?> viewContext)
+        ListSampleTypesCallback(final IViewContext<?> viewContext)
         {
             super(viewContext);
         }
 
         @Override
-        protected void process(List<SampleType> result)
+        protected void process(final List<SampleType> result)
         {
+            sampleTypeStore.removeAll();
             sampleTypeStore.add(convert(result));
             if (sampleTypeStore.getCount() > 0)
             {
@@ -59,10 +60,10 @@ class SampleTypeSelectionWidget extends ExtendedComboBox<SampleTypeModel>
             }
         }
 
-        List<SampleTypeModel> convert(List<SampleType> sampleTypes)
+        List<SampleTypeModel> convert(final List<SampleType> sampleTypes)
         {
-            List<SampleTypeModel> result = new ArrayList<SampleTypeModel>();
-            for (SampleType st : sampleTypes)
+            final List<SampleTypeModel> result = new ArrayList<SampleTypeModel>();
+            for (final SampleType st : sampleTypes)
             {
                 result.add(new SampleTypeModel(st));
             }
@@ -76,9 +77,9 @@ class SampleTypeSelectionWidget extends ExtendedComboBox<SampleTypeModel>
 
     private final GenericViewContext viewContext;
 
-    private ListStore<SampleTypeModel> sampleTypeStore;
+    private final ListStore<SampleTypeModel> sampleTypeStore;
 
-    public SampleTypeSelectionWidget(GenericViewContext viewContext)
+    public SampleTypeSelectionWidget(final GenericViewContext viewContext)
     {
         this.viewContext = viewContext;
         setId(ID);
@@ -92,7 +93,7 @@ class SampleTypeSelectionWidget extends ExtendedComboBox<SampleTypeModel>
         addListener(Events.OnClick, new Listener<BaseEvent>()
             {
 
-                public void handleEvent(BaseEvent be)
+                public void handleEvent(final BaseEvent be)
                 {
                     expand();
                 }
@@ -112,6 +113,13 @@ class SampleTypeSelectionWidget extends ExtendedComboBox<SampleTypeModel>
         }
     }
 
+    @Override
+    protected void onLoad()
+    {
+        super.onLoad();
+        refresh();
+    }
+
     void refresh()
     {
         viewContext.getService().listSampleTypes(new ListSampleTypesCallback(viewContext));