From 7815a8cdcaa752212cb3cf7b56877a915dcdbc02 Mon Sep 17 00:00:00 2001 From: buczekp <buczekp> Date: Wed, 25 Mar 2009 13:08:39 +0000 Subject: [PATCH] refactor: rename misspelled IDelagatedAction to IDelegatedAction SVN: 10379 --- .../web/client/application/GroupsView.java | 4 ++-- .../web/client/application/PersonsView.java | 4 ++-- .../ui/AbstractEntityTypeGrid.java | 4 ++-- .../application/ui/amc/AddGroupDialog.java | 4 ++-- .../application/ui/amc/AddPersonDialog.java | 4 ++-- .../ui/field/EntityChooserDialog.java | 14 ++++++------- .../ui/grid/AbstractBrowserGrid.java | 21 ++++++++++++++----- .../ui/grid/PagingColumnFilter.java | 6 +++--- .../ui/material/AddEntityTypeDialog.java | 4 ++-- .../ui/widget/AbstractRegistrationDialog.java | 6 +++--- .../application/ui/widget/SimpleDialog.java | 10 ++++----- ...gatedAction.java => IDelegatedAction.java} | 2 +- 12 files changed, 47 insertions(+), 36 deletions(-) rename openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/{IDelagatedAction.java => IDelegatedAction.java} (96%) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GroupsView.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GroupsView.java index cde08963b85..9b03fd65e2d 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GroupsView.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GroupsView.java @@ -47,7 +47,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.ColumnF import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.amc.AddGroupDialog; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.framework.AbstractColumnDefinitionKind; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils; -import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelagatedAction; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Group; /** @@ -163,7 +163,7 @@ public class GroupsView extends ContentPanel public void componentSelected(ComponentEvent ce) { AddGroupDialog dialog = - new AddGroupDialog(viewContext, new IDelagatedAction() + new AddGroupDialog(viewContext, new IDelegatedAction() { public void execute() { diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PersonsView.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PersonsView.java index e4ea7c8ed82..841b01505b6 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PersonsView.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PersonsView.java @@ -45,7 +45,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.ColumnF import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.amc.AddPersonDialog; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.framework.AbstractColumnDefinitionKind; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils; -import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelagatedAction; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person; /** @@ -164,7 +164,7 @@ public class PersonsView extends ContentPanel public void componentSelected(ComponentEvent ce) { AddPersonDialog dialog = - new AddPersonDialog(viewContext, new IDelagatedAction() + new AddPersonDialog(viewContext, new IDelegatedAction() { public void execute() { diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractEntityTypeGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractEntityTypeGrid.java index a1baf8cba74..1bc3380e203 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractEntityTypeGrid.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractEntityTypeGrid.java @@ -33,7 +33,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.EntityTypeColDefKind; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.AbstractSimpleBrowserGrid; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.material.AddEntityTypeDialog; -import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelagatedAction; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.IColumnDefinition; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType; @@ -74,7 +74,7 @@ abstract public class AbstractEntityTypeGrid extends AbstractSimpleBrowserGrid<E private Window createRegisterEntityTypeDialog(final String title) { - IDelagatedAction postRegistrationCallback = new IDelagatedAction() + IDelegatedAction postRegistrationCallback = new IDelegatedAction() { public void execute() { diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddGroupDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddGroupDialog.java index c3881ad5e99..a44576ea3da 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddGroupDialog.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddGroupDialog.java @@ -22,7 +22,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import ch.systemsx.cisd.openbis.generic.client.web.client.application.CommonViewContext; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.AbstractRegistrationDialog; -import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelagatedAction; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction; /** * {@link Window} containing group registration form. @@ -39,7 +39,7 @@ public class AddGroupDialog extends AbstractRegistrationDialog private final TextField<String> descriptionField; public AddGroupDialog(final CommonViewContext viewContext, - final IDelagatedAction postRegistrationCallback) + final IDelegatedAction postRegistrationCallback) { super(viewContext, "Add a new group", postRegistrationCallback); this.viewContext = viewContext; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPersonDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPersonDialog.java index c4a5fb14a5a..4d9e0b82058 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPersonDialog.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPersonDialog.java @@ -22,7 +22,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import ch.systemsx.cisd.openbis.generic.client.web.client.application.CommonViewContext; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.AbstractRegistrationDialog; -import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelagatedAction; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction; /** * {@link Window} containing person registration form. @@ -36,7 +36,7 @@ public class AddPersonDialog extends AbstractRegistrationDialog private final TextField<String> codeField; public AddPersonDialog(final CommonViewContext viewContext, - final IDelagatedAction postRegistrationCallback) + final IDelegatedAction postRegistrationCallback) { super(viewContext, "Add a new person", postRegistrationCallback); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java index baad0634b45..c0904b11083 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java @@ -23,7 +23,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.DisposableComponent; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.DisposableEntityChooser; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.SimpleDialog; -import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelagatedAction; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider; /** @@ -42,9 +42,9 @@ class EntityChooserDialog<T> extends SimpleDialog private final DisposableEntityChooser<T> entityBrowser; - private final IDelagatedAction onAcceptAction; + private final IDelegatedAction onAcceptAction; - private final IDelagatedAction onCancelAction; + private final IDelegatedAction onCancelAction; interface ChosenEntitySetter<T> { @@ -86,11 +86,11 @@ class EntityChooserDialog<T> extends SimpleDialog super.onComponentEvent(ce); } - private static <T> IDelagatedAction createAcceptAction( + private static <T> IDelegatedAction createAcceptAction( final ChosenEntitySetter<T> chosenEntitySetter, final DisposableEntityChooser<T> entityBrowser) { - return new IDelagatedAction() + return new IDelegatedAction() { public void execute() { @@ -101,11 +101,11 @@ class EntityChooserDialog<T> extends SimpleDialog }; } - private static <T> IDelagatedAction createCancelAction( + private static <T> IDelegatedAction createCancelAction( final ChosenEntitySetter<T> chosenEntitySetter, final DisposableComponent componentDisposer) { - return new IDelagatedAction() + return new IDelegatedAction() { public void execute() { 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 82f9f0689dd..020fcde0aac 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 @@ -64,7 +64,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.VoidAsyncC import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.BaseEntityModel; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.framework.IColumnDefinitionKind; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils; -import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelagatedAction; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.URLMethodWithParameters; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.WindowUtils; @@ -214,7 +214,18 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod { columnListener.registerCellClickListener(columnID, listener); } - + + /** + * Registers the specified listener for clicks on links in the specified column. + * + * @param columnID Column ID. Not case sensitive. + * @param listener Listener handle single clicks. + */ + public void registerLinkClickListenerFor(final String columnID, final ICellListener<T> listener) + { + columnListener.registerLinkClickListener(columnID, listener); + } + /** * Allows multiple selection instead of single selection. */ @@ -228,9 +239,9 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod return createFilterWidgets(getAvailableFilters(), createApplyFiltersDelagator()); } - private IDelagatedAction createApplyFiltersDelagator() + private IDelegatedAction createApplyFiltersDelagator() { - return new IDelagatedAction() + return new IDelegatedAction() { public void execute() { @@ -243,7 +254,7 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod } private static <T> List<PagingColumnFilter<T>> createFilterWidgets( - List<IColumnDefinition<T>> availableFilters, IDelagatedAction onFilterAction) + List<IColumnDefinition<T>> availableFilters, IDelegatedAction onFilterAction) { List<PagingColumnFilter<T>> filterWidgets = new ArrayList<PagingColumnFilter<T>>(); for (IColumnDefinition<T> columnDefinition : availableFilters) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/PagingColumnFilter.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/PagingColumnFilter.java index 5bd5e411e7f..3c7d47e2662 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/PagingColumnFilter.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/PagingColumnFilter.java @@ -20,7 +20,7 @@ import com.extjs.gxt.ui.client.data.ModelData; import com.extjs.gxt.ui.client.store.Store; import com.extjs.gxt.ui.client.widget.StoreFilterField; -import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelagatedAction; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.GridFilterInfo; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.IColumnDefinition; @@ -33,10 +33,10 @@ public class PagingColumnFilter<T/* entity */> extends StoreFilterField<ModelDat { private final IColumnDefinition<T> filteredField; - private final IDelagatedAction onFilterAction; + private final IDelegatedAction onFilterAction; /** @param onFilterAction callback executed when data are about to be filtered. */ - public PagingColumnFilter(IColumnDefinition<T> filteredField, IDelagatedAction onFilterAction) + public PagingColumnFilter(IColumnDefinition<T> filteredField, IDelegatedAction onFilterAction) { this.filteredField = filteredField; this.onFilterAction = onFilterAction; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/AddEntityTypeDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/AddEntityTypeDialog.java index d7132a3de19..f99e4c6c2a5 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/AddEntityTypeDialog.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/AddEntityTypeDialog.java @@ -22,7 +22,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync; import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext; import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.AbstractRegistrationDialog; -import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelagatedAction; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction; /** * Dialog to register a new material type. @@ -40,7 +40,7 @@ abstract public class AddEntityTypeDialog extends AbstractRegistrationDialog private final TextField<String> descriptionField; public AddEntityTypeDialog(final IViewContext<ICommonClientServiceAsync> viewContext, - String title, final IDelagatedAction postRegistrationCallback) + String title, final IDelegatedAction postRegistrationCallback) { super(viewContext, title, postRegistrationCallback); this.codeField = createCodeField(); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractRegistrationDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractRegistrationDialog.java index 11a9b40fc73..854b48d3ab1 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractRegistrationDialog.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractRegistrationDialog.java @@ -29,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAs import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext; -import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelagatedAction; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction; /** * Abstract {@link Window} with Save and Cancel buttons, useful when simple registration operation @@ -60,14 +60,14 @@ abstract public class AbstractRegistrationDialog extends Window public static final String CODE_FIELD_ID = GenericConstants.ID_PREFIX + "dialog-code-field"; - private final IDelagatedAction postRegistrationCallback; + private final IDelegatedAction postRegistrationCallback; private final IViewContext<?> viewContext; private final FormPanel form; public AbstractRegistrationDialog(final IViewContext<?> viewContext, String title, - final IDelagatedAction postRegistrationCallback) + final IDelegatedAction postRegistrationCallback) { this.postRegistrationCallback = postRegistrationCallback; this.viewContext = viewContext; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleDialog.java index 86f989111ed..86bb46bcb45 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleDialog.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleDialog.java @@ -27,7 +27,7 @@ import com.google.gwt.user.client.ui.Widget; import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; -import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelagatedAction; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider; /** @@ -42,9 +42,9 @@ public class SimpleDialog extends Dialog private final IMessageProvider messageProvider; - private IDelagatedAction acceptActionOrNull; + private IDelegatedAction acceptActionOrNull; - private IDelagatedAction cancelActionOrNull; + private IDelegatedAction cancelActionOrNull; public SimpleDialog(final Widget widget, final String heading, String acceptButtonLabel, IMessageProvider messageProvider) @@ -100,12 +100,12 @@ public class SimpleDialog extends Dialog return button; } - public void setAcceptAction(IDelagatedAction acceptActionOrNull) + public void setAcceptAction(IDelegatedAction acceptActionOrNull) { this.acceptActionOrNull = acceptActionOrNull; } - public void setCancelAction(IDelagatedAction cancelActionOrNull) + public void setCancelAction(IDelegatedAction cancelActionOrNull) { this.cancelActionOrNull = cancelActionOrNull; } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelagatedAction.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelegatedAction.java similarity index 96% rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelagatedAction.java rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelegatedAction.java index dd85d5d021c..dbf5ab702f3 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelagatedAction.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelegatedAction.java @@ -22,7 +22,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.util; * * @author Tomasz Pylak */ -public interface IDelagatedAction +public interface IDelegatedAction { void execute(); } -- GitLab