Lior Vernia has uploaded a new change for review. Change subject: webadmin: Reset status panel on redraw ......................................................................
webadmin: Reset status panel on redraw A recent regression caused status messages to linger on past a redraw. This is changed so only warning messages survive redraws. Change-Id: Ic110c6dd4198a03c3274dfbb9fe39a8687a9861a Bug-Url: https://bugzilla.redhat.com/1115109 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/OperationCadidateEventArgs.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/StatusLabel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/StatusPanel.java 6 files changed, 23 insertions(+), 35 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/31516/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java index 6a38d33..4315e15 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java @@ -221,12 +221,12 @@ onOperation(candidate, candidate.getCommand(op1, op2, allNics)); } - // raise the candidate event only if it was changed or if a drop occurred - if (drop || !candidate.equals(currentCandidate) || !equals(op1, currentOp1) || !equals(op2, currentOp2)) { + // raise the candidate event only if it was changed + if (!candidate.equals(currentCandidate) || !equals(op1, currentOp1) || !equals(op2, currentOp2)) { currentCandidate = candidate; currentOp1 = op1; currentOp2 = op2; - getOperationCandidateEvent().raise(this, new OperationCadidateEventArgs(candidate, op1, op2, drop)); + getOperationCandidateEvent().raise(this, new OperationCadidateEventArgs(candidate, op1, op2)); } return !candidate.isNullOperation(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/OperationCadidateEventArgs.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/OperationCadidateEventArgs.java index ba07147..8d96256 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/OperationCadidateEventArgs.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/OperationCadidateEventArgs.java @@ -13,17 +13,13 @@ private final NetworkItemModel<?> op2; - private final boolean drop; - public OperationCadidateEventArgs(NetworkOperation candidate, NetworkItemModel<?> op1, - NetworkItemModel<?> op2, - boolean drop) { + NetworkItemModel<?> op2) { this.candidate = candidate; this.op1 = op1; this.op2 = op2; - this.drop = drop; } public NetworkOperation getCandidate() { @@ -36,10 +32,6 @@ public NetworkItemModel<?> getOp2() { return op2; - } - - public boolean isDrop() { - return drop; } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java index 024c141..4ea9aec 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java @@ -85,6 +85,7 @@ private final Driver driver = GWT.create(Driver.class); private boolean rendered = false; + private boolean keepStatusText; private final ApplicationConstants constants; private final ApplicationMessages applicationMessages; @@ -107,7 +108,7 @@ commitChangesInfo = new InfoIcon(templates.italicTwoLines(constants.commitChangesInfoPart1(), constants.commitChangesInfoPart2()), resources); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); - + initStatusPanel(); checkConnectivity.setContentWidgetStyleName(style.checkCon()); commitChanges.setContentWidgetStyleName(style.commitChanges()); initUnassignedNetworksPanel(); @@ -135,6 +136,10 @@ HostSetupNetworksModel model = (HostSetupNetworksModel) sender; List<LogicalNetworkModel> networks = model.getNetworks(); List<NetworkInterfaceModel> nics = model.getNics(); + if (!keepStatusText) { + initStatusPanel(); + } + keepStatusText = false; updateNetworks(networks); updateNics(nics); // mark as rendered @@ -203,15 +208,22 @@ nicList.addAll(groups, !rendered); } + private void initStatusPanel() { + setValidStatus(constants.dragToMakeChangesSetupNetwork()); + } + private void setValidStatus(String message) { + keepStatusText = false; statusPanel.setTextAndStyle(message, style.statusPanel(), style.statusLabel()); } private void setWarningStatus(String message) { + keepStatusText = true; statusPanel.setTextAndStyle(message, style.warningPanel(), style.warningLabel()); } private void setErrorStatus(String message) { + keepStatusText = false; statusPanel.setTextAndStyle(message, style.errorPanel(), style.errorLabel()); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml index 46e454a..77ef981 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.ui.xml @@ -233,10 +233,7 @@ <d:SimpleDialogPanel width="900px" height="600px"> <d:content> <g:HTMLPanel> - <f:StatusPanel ui:field="statusPanel" - text="{constants.dragToMakeChangesSetupNetwork}" - foregroundStyle="{style.statusLabel}" - backgroundStyle="{style.statusPanel}"/> + <f:StatusPanel ui:field="statusPanel" /> <g:HorizontalPanel width="100%" height="77%" verticalAlignment="ALIGN_TOP" addStyleNames="ts10"> <g:Cell width="69%" height="100%"> <g:VerticalPanel width="100%" horizontalAlignment="ALIGN_LEFT"> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/StatusLabel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/StatusLabel.java index 5c4aeb2..c1c1d3e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/StatusLabel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/StatusLabel.java @@ -44,11 +44,6 @@ } }; - StatusLabel(String text, String style) { - super(text); - setStylePrimaryName(style); - } - public void setFadeText(String text) { pendingText = text; fadeInAnimation.cancel(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/StatusPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/StatusPanel.java index 379ae85..93651b8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/StatusPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/footer/StatusPanel.java @@ -1,6 +1,5 @@ package org.ovirt.engine.ui.webadmin.widget.footer; -import com.google.gwt.uibinder.client.UiConstructor; import com.google.gwt.user.client.ui.SimplePanel; public final class StatusPanel extends SimplePanel { @@ -10,16 +9,12 @@ private String foregroundStyle; private String backgroundStyle; - @UiConstructor - public StatusPanel(String text, String backgroundStyle, String foregroundStyle) { - this.foregroundStyle = foregroundStyle; - this.backgroundStyle = backgroundStyle; - setStylePrimaryName(backgroundStyle); - this.statusLabel = new StatusLabel(text, foregroundStyle) { + public StatusPanel() { + this.statusLabel = new StatusLabel() { @Override protected void onFadeInComplete() { - setStylePrimaryName(StatusPanel.this.foregroundStyle); - StatusPanel.this.setStylePrimaryName(StatusPanel.this.backgroundStyle); + setStylePrimaryName(foregroundStyle); + StatusPanel.this.setStylePrimaryName(backgroundStyle); } }; add(statusLabel); @@ -28,10 +23,7 @@ public void setTextAndStyle(String text, String backgroundStyle, String foregroundStyle) { this.backgroundStyle = backgroundStyle; this.foregroundStyle = foregroundStyle; - setFadeText(text); - } - - public void setFadeText(String text) { statusLabel.setFadeText(text); } + } -- To view, visit http://gerrit.ovirt.org/31516 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic110c6dd4198a03c3274dfbb9fe39a8687a9861a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
