From bda27868089c6da151a97a7f104c45cbf64a67e1 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Tue, 6 Oct 2009 16:17:10 +0000
Subject: [PATCH] LMS-1204 remove unnecessary usage of IDelegatedAction
interface
SVN: 12864
---
.../client/application/ui/grid/AbstractBrowserGrid.java | 4 ++--
.../grid/expressions/filter/FilterSelectionWidget.java | 9 +--------
.../ui/grid/expressions/filter/FilterToolbar.java | 7 +++----
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
index 1eee84c7012..4c38d643270 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
@@ -891,7 +891,7 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
pagingToolbar.updateDefaultConfigButton(false);
// export and config buttons are enabled when ListEntitiesCallback is complete
refresh();
- filterToolbar.execute();
+ filterToolbar.refresh();
}
};
}
@@ -1203,7 +1203,7 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
// settings will be automatically stored because of event handling
refreshColumnsSettings();
refreshColumnHeaderWidths();
- filterToolbar.execute();
+ filterToolbar.refresh();
}
};
List<ColumnDataModel> settingsModel =
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterSelectionWidget.java
index c4da2ab76de..1aaa4c9dc98 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterSelectionWidget.java
@@ -26,7 +26,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewConte
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ModelDataPropertyNames;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisplayTypeIDProvider;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.DropDownList;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.GridCustomFilter;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.ObjectKind;
@@ -36,8 +35,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKin
*
* @author Izabela Adamczyk
*/
-public final class FilterSelectionWidget extends DropDownList<FilterModel, GridCustomFilter> implements
- IDelegatedAction
+public final class FilterSelectionWidget extends DropDownList<FilterModel, GridCustomFilter>
{
private static final String LIST_ITEMS_CALLBACK = "ListItemsCallback";
@@ -83,9 +81,4 @@ public final class FilterSelectionWidget extends DropDownList<FilterModel, GridC
{
return DatabaseModificationKind.any(ObjectKind.GRID_CUSTOM_FILTER);
}
-
- public void execute()
- {
- refreshStore();
- }
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java
index 06e116caba1..b9d35df553b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java
@@ -40,8 +40,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.GridCustomFilter;
*
* @author Izabela Adamczyk
*/
-public class FilterToolbar<T> extends ToolBar implements IDatabaseModificationObserver,
- IDelegatedAction
+public class FilterToolbar<T> extends ToolBar implements IDatabaseModificationObserver
{
static final String APPLY_ID = "apply_button";
@@ -285,9 +284,9 @@ public class FilterToolbar<T> extends ToolBar implements IDatabaseModificationOb
}
}
- public void execute()
+ public void refresh()
{
- filterSelectionWidget.execute();
+ filterSelectionWidget.refreshStore();
}
}
--
GitLab