Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: rename ImageButtonCell -> AbstractImageButtonCell ......................................................................
userportal, webadmin: rename ImageButtonCell -> AbstractImageButtonCell Change-Id: Ide4c8b76490e579e81b9c7813436364aaaea8a4a Signed-off-by: Greg Sheremeta <[email protected]> --- R frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/AbstractImageButtonCell.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/cell/VmButtonsImageButtonCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/AlertsEventsFooterView.java 4 files changed, 13 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/39101/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageButtonCell.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/AbstractImageButtonCell.java similarity index 95% rename from frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageButtonCell.java rename to frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/AbstractImageButtonCell.java index ec4657a..79a276c 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageButtonCell.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/AbstractImageButtonCell.java @@ -23,9 +23,8 @@ * * @param <T> * The data type of the cell (the model) - * TODO rename abstract? */ -public abstract class ImageButtonCell<T> extends AbstractCell<T> { +public abstract class AbstractImageButtonCell<T> extends AbstractCell<T> { interface CellTemplate extends SafeHtmlTemplates { @Template("<span id=\"{0}\" class=\"{1}\">{2}</span>") @@ -40,7 +39,7 @@ private final SafeHtml disabledHtml; private final String disabledClassNames; - public ImageButtonCell(ImageResource enabledImage, String enabledClassNames, + public AbstractImageButtonCell(ImageResource enabledImage, String enabledClassNames, ImageResource disabledImage, String disabledClassNames) { super(); this.enabledHtml = SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(enabledImage).getHTML()); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java index 5fca85a..ce72ffd 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedVirtualMachineView.java @@ -7,7 +7,7 @@ import org.ovirt.engine.ui.common.system.ClientStorage; import org.ovirt.engine.ui.common.widget.table.SimpleActionTable; import org.ovirt.engine.ui.common.widget.table.cell.AbstractCell; -import org.ovirt.engine.ui.common.widget.table.cell.ImageButtonCell; +import org.ovirt.engine.ui.common.widget.table.cell.AbstractImageButtonCell; import org.ovirt.engine.ui.common.widget.table.column.AbstractColumn; import org.ovirt.engine.ui.common.widget.table.column.EmptyColumn; import org.ovirt.engine.ui.uicommonweb.ErrorPopupManager; @@ -58,7 +58,7 @@ ViewIdHandler idHandler = GWT.create(ViewIdHandler.class); } - protected abstract class AbstractVmButtonsImageButtonCell extends ImageButtonCell<UserPortalItemModel> { + protected abstract class AbstractVmButtonsImageButtonCell extends AbstractImageButtonCell<UserPortalItemModel> { public AbstractVmButtonsImageButtonCell(ImageResource enabledImage, ImageResource disabledImage) { super(enabledImage, resources.sideTabExtendedVmStyle().vmButtonEnabled(), @@ -325,7 +325,7 @@ @SuppressWarnings({ "rawtypes", "unchecked" }) protected CompositeCell<UserPortalItemModel> createActionsCompositeCell(String elementIdPrefix) { - ImageButtonCell<UserPortalItemModel> runCell = new VmButtonsImageButtonCell( + AbstractImageButtonCell<UserPortalItemModel> runCell = new VmButtonsImageButtonCell( resources.playIcon(), resources.playDisabledIcon()) { @Override public SafeHtml getTooltip(UserPortalItemModel value) { @@ -340,7 +340,7 @@ runCell.setElementIdPrefix(elementIdPrefix); runCell.setColumnId("runButton"); //$NON-NLS-1$ - ImageButtonCell<UserPortalItemModel> shutdownCell = new VmButtonsImageButtonCell( + AbstractImageButtonCell<UserPortalItemModel> shutdownCell = new VmButtonsImageButtonCell( resources.stopIcon(), resources.stopDisabledIcon()) { @Override public SafeHtml getTooltip(UserPortalItemModel value) { @@ -355,7 +355,7 @@ shutdownCell.setElementIdPrefix(elementIdPrefix); shutdownCell.setColumnId("shutdownButton"); //$NON-NLS-1$ - ImageButtonCell<UserPortalItemModel> suspendCell = new VmButtonsImageButtonCell( + AbstractImageButtonCell<UserPortalItemModel> suspendCell = new VmButtonsImageButtonCell( resources.suspendIcon(), resources.suspendDisabledIcon()) { @Override public SafeHtml getTooltip(UserPortalItemModel value) { @@ -370,7 +370,7 @@ suspendCell.setElementIdPrefix(elementIdPrefix); suspendCell.setColumnId("suspendButton"); //$NON-NLS-1$ - ImageButtonCell<UserPortalItemModel> stopCell = new VmButtonsImageButtonCell( + AbstractImageButtonCell<UserPortalItemModel> stopCell = new VmButtonsImageButtonCell( resources.powerIcon(), resources.powerDisabledIcon()) { @Override public SafeHtml getTooltip(UserPortalItemModel value) { @@ -385,7 +385,7 @@ stopCell.setElementIdPrefix(elementIdPrefix); stopCell.setColumnId("stopButton"); //$NON-NLS-1$ - ImageButtonCell<UserPortalItemModel> rebootCell = new VmButtonsImageButtonCell( + AbstractImageButtonCell<UserPortalItemModel> rebootCell = new VmButtonsImageButtonCell( resources.rebootIcon(), resources.rebootDisabledIcon()) { @Override diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/cell/VmButtonsImageButtonCell.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/cell/VmButtonsImageButtonCell.java index 065575d..45c0638 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/cell/VmButtonsImageButtonCell.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/cell/VmButtonsImageButtonCell.java @@ -1,13 +1,13 @@ package org.ovirt.engine.ui.userportal.widget.table.cell; -import org.ovirt.engine.ui.common.widget.table.cell.ImageButtonCell; +import org.ovirt.engine.ui.common.widget.table.cell.AbstractImageButtonCell; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalItemModel; import org.ovirt.engine.ui.userportal.ApplicationResources; import org.ovirt.engine.ui.userportal.gin.AssetProvider; import com.google.gwt.resources.client.ImageResource; -public abstract class VmButtonsImageButtonCell extends ImageButtonCell<UserPortalItemModel> { +public abstract class VmButtonsImageButtonCell extends AbstractImageButtonCell<UserPortalItemModel> { private final static ApplicationResources resources = AssetProvider.getResources(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/AlertsEventsFooterView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/AlertsEventsFooterView.java index 67c3489..a23d25c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/AlertsEventsFooterView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/AlertsEventsFooterView.java @@ -10,7 +10,7 @@ import org.ovirt.engine.ui.common.uicommon.model.SearchableTabModelProvider; import org.ovirt.engine.ui.common.widget.action.CommandLocation; import org.ovirt.engine.ui.common.widget.table.SimpleActionTable; -import org.ovirt.engine.ui.common.widget.table.cell.ImageButtonCell; +import org.ovirt.engine.ui.common.widget.table.cell.AbstractImageButtonCell; import org.ovirt.engine.ui.common.widget.table.column.AbstractColumn; import org.ovirt.engine.ui.common.widget.table.column.AbstractFullDateTimeColumn; import org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn; @@ -508,7 +508,7 @@ } } - class DismissAuditLogImageButtonCell extends ImageButtonCell<AuditLog> { + class DismissAuditLogImageButtonCell extends AbstractImageButtonCell<AuditLog> { AlertModelProvider alertModelProvider; -- To view, visit https://gerrit.ovirt.org/39101 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ide4c8b76490e579e81b9c7813436364aaaea8a4a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
