Martin Betak has uploaded a new change for review. Change subject: frontend: refactoring: Remove unused isImplemented checks for buttons ......................................................................
frontend: refactoring: Remove unused isImplemented checks for buttons Removed dead code: - isImplemented() -> always true - isImlInUserportal() -> always false - as a result FeatureNotImplementedYetPopup was never shown Change-Id: I5015e5fc13d845394b66f8a554b1198692cc7d81 Signed-off-by: Martin Betak <[email protected]> --- D frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/FeatureNotImplementedYetPopup.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionPanel.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractButtonDefinition.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/ActionButtonDefinition.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/UiMenuBarButtonDefinition.java 5 files changed, 11 insertions(+), 104 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/37666/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/FeatureNotImplementedYetPopup.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/FeatureNotImplementedYetPopup.java deleted file mode 100644 index 04abc05..0000000 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/FeatureNotImplementedYetPopup.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ovirt.engine.ui.common.widget; - -import org.ovirt.engine.ui.common.CommonApplicationConstants; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.ui.DecoratedPopupPanel; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Widget; - -public class FeatureNotImplementedYetPopup extends DecoratedPopupPanel { - - private static final CommonApplicationConstants CONSTANTS = GWT.create(CommonApplicationConstants.class); - - public FeatureNotImplementedYetPopup(Widget target, boolean availableInUserPortal) { - super(true); - - if (availableInUserPortal) { - setWidget(new Label(CONSTANTS.featureNotImplementedButAvailInUserPortalMessage())); - } else { - setWidget(new Label(CONSTANTS.featureNotImplementedMessage())); - } - - setWidth("200px"); //$NON-NLS-1$ - int left = target.getAbsoluteLeft() + 10; - int top = target.getAbsoluteTop() + 10; - setPopupPosition(left, top); - } - -} diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionPanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionPanel.java index c32ebda..b046c8c 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionPanel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractActionPanel.java @@ -11,7 +11,6 @@ import org.ovirt.engine.ui.common.system.HeaderOffsetChangeEvent; import org.ovirt.engine.ui.common.uicommon.model.SearchableModelProvider; import org.ovirt.engine.ui.common.utils.ElementIdUtils; -import org.ovirt.engine.ui.common.widget.FeatureNotImplementedYetPopup; import org.ovirt.engine.ui.common.widget.MenuBar; import org.ovirt.engine.ui.common.widget.PopupPanel; import org.ovirt.engine.ui.common.widget.TitleMenuItemSeparator; @@ -344,25 +343,20 @@ newActionButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { - if (buttonDef.isImplemented()) { - if (buttonDef instanceof UiMenuBarButtonDefinition) { - actionPanelPopupPanel.asPopupPanel().addAutoHidePartner(newActionButton.asToggleButton() - .getElement()); - if (newActionButton.asToggleButton().isDown()) { - updateContextMenu(actionPanelPopupPanel.getMenuBar(), - ((UiMenuBarButtonDefinition<T>) buttonDef).getSubActions(), - actionPanelPopupPanel.asPopupPanel()); - actionPanelPopupPanel.asPopupPanel() - .showRelativeToAndFitToScreen(newActionButton.asWidget()); - } else { - actionPanelPopupPanel.asPopupPanel().hide(); - } + if (buttonDef instanceof UiMenuBarButtonDefinition) { + actionPanelPopupPanel.asPopupPanel().addAutoHidePartner(newActionButton.asToggleButton() + .getElement()); + if (newActionButton.asToggleButton().isDown()) { + updateContextMenu(actionPanelPopupPanel.getMenuBar(), + ((UiMenuBarButtonDefinition<T>) buttonDef).getSubActions(), + actionPanelPopupPanel.asPopupPanel()); + actionPanelPopupPanel.asPopupPanel() + .showRelativeToAndFitToScreen(newActionButton.asWidget()); } else { - buttonDef.onClick(getSelectedItems()); + actionPanelPopupPanel.asPopupPanel().hide(); } } else { - new FeatureNotImplementedYetPopup((Widget) event.getSource(), - buttonDef.isImplInUserPortal()).show(); + buttonDef.onClick(getSelectedItems()); } } }); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractButtonDefinition.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractButtonDefinition.java index c0e7adc..5226995 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractButtonDefinition.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/AbstractButtonDefinition.java @@ -25,12 +25,6 @@ protected final SafeHtml title; - // Indicates whether the given feature is implemented in WebAdmin - private final boolean implInWebAdmin; - - // Indicates whether the given feature is implemented in UserPortal - private final boolean implInUserPortal; - // Indicates whether the given feature is available only from a context menu private final CommandLocation commandLocation; @@ -42,22 +36,13 @@ private boolean isCascaded = false; public AbstractButtonDefinition(EventBus eventBus, String title, - boolean implInWebAdmin, boolean implInUserPortal, CommandLocation commandLocation, boolean subTitledAction, String toolTip) { this.eventBus = eventBus; this.title = SafeHtmlUtils.fromSafeConstant(title); - this.implInWebAdmin = implInWebAdmin; - this.implInUserPortal = implInUserPortal; this.commandLocation = commandLocation; this.subTitledAction = subTitledAction; this.toolTip = toolTip; - } - - public AbstractButtonDefinition(EventBus eventBus, String title, - CommandLocation commandLocation, boolean subTitledAction, - String toolTip) { - this(eventBus, title, true, false, commandLocation, subTitledAction, toolTip); } public AbstractButtonDefinition(EventBus eventBus, String title, @@ -133,16 +118,6 @@ @Override public String getTitle() { return title.asString(); - } - - @Override - public boolean isImplemented() { - return implInWebAdmin; - } - - @Override - public boolean isImplInUserPortal() { - return implInUserPortal; } @Override diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/ActionButtonDefinition.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/ActionButtonDefinition.java index 9f7f5a5..f990f53 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/ActionButtonDefinition.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/ActionButtonDefinition.java @@ -66,29 +66,6 @@ String getUniqueId(); /** - * Indicates whether the functionality bound to this action button is implemented. - * <p> - * This is only relevant for a tech-preview of the given application, where not all buttons might be implemented. - * <p> - * TODO: This is temporary and should be cleaned up when WebAdmin will be fully implemented! - * - * @return Whether the functionality bound to this action button is implemented or not. - */ - boolean isImplemented(); - - /** - * If {@link #isImplemented} is {@code true}, this method indicates whether this action button is available in - * UserPortal. - * <p> - * This is only affecting the message that will be shown when the button is clicked. - * <p> - * TODO: This is temporary and should be cleaned up when WebAdmin will be fully implemented! - * - * @return Whether this action button is available in UserPortal or not. - */ - boolean isImplInUserPortal(); - - /** * Indicates whether this action button is available only from the corresponding context menu. */ CommandLocation getCommandLocation(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/UiMenuBarButtonDefinition.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/UiMenuBarButtonDefinition.java index 97f8b3e..9bfb7cf 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/UiMenuBarButtonDefinition.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/action/UiMenuBarButtonDefinition.java @@ -96,16 +96,6 @@ } @Override - public boolean isImplemented() { - return true; - } - - @Override - public boolean isImplInUserPortal() { - return false; - } - - @Override public void update() { // Do nothing } -- To view, visit http://gerrit.ovirt.org/37666 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5015e5fc13d845394b66f8a554b1198692cc7d81 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Betak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
