Lior Vernia has uploaded a new change for review. Change subject: webadmin: Improve VM interface explanatory text ......................................................................
webadmin: Improve VM interface explanatory text Changed the text to conform with the changes to the widget. Change-Id: I79d0d3d62f48c1d56292e65f5087a7a7100e118a Bug-Url: https://bugzilla.redhat.com/1032513 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.ui.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java 4 files changed, 13 insertions(+), 56 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/25550/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java index 193e4d4..ab45833 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java @@ -99,14 +99,8 @@ @DefaultMessage("default: {0}") String defaultTimeZoneCaption(String currentDefault); - @DefaultMessage("VM has {0} network interfaces. Assign profiles to them.") - String assignNicsToProfilesPlural(int numOfNics); - - @DefaultMessage("VM has 1 network interface. Assign a profile to it.") - String assignNicsToProfilesSingular(); - - @DefaultMessage("VM has no network interfaces. To add one, assign a profile.") - String assignNicsNothingToAssign(); + @DefaultMessage("Instantiate VM network interfaces by picking a vNIC profile.") + String assignNics(); @DefaultMessage("<Empty>") SafeHtml emptyProfile(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java index c7c1e1c..85b689a 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java @@ -1,11 +1,12 @@ package org.ovirt.engine.ui.common.widget.profile; import java.util.ArrayList; -import java.util.List; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VnicProfileView; -import org.ovirt.engine.ui.common.CommonApplicationMessages; import org.ovirt.engine.ui.common.idhandler.HasElementId; import org.ovirt.engine.ui.common.widget.AddRemoveRowWidget; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; @@ -14,9 +15,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; public class ProfilesInstanceTypeEditor extends AddRemoveRowWidget<VnicInstancesModel, VnicInstanceType, ProfileInstanceTypeEditor> implements HasElementId { @@ -27,18 +26,11 @@ private String elementId = DOM.createUniqueId(); - @Ignore - @UiField - Label headerLabel; - - private static final CommonApplicationMessages messages = GWT.create(CommonApplicationMessages.class); - - private Iterable<VnicProfileView> vnicProfiles; - private final List<VmNetworkInterface> vnics; - private int realEntryCount; + private Collection<VnicProfileView> vnicProfiles; + private final Set<VmNetworkInterface> vnics; public ProfilesInstanceTypeEditor() { - vnics = new ArrayList<VmNetworkInterface>(); + vnics = new HashSet<VmNetworkInterface>(); initWidget(WidgetUiBinder.uiBinder.createAndBindUi(this)); } @@ -49,47 +41,19 @@ @Override protected void init(VnicInstancesModel model) { - vnicProfiles = model.getVnicProfiles().getItems(); + vnicProfiles = (Collection<VnicProfileView>) model.getVnicProfiles().getItems(); if (vnicProfiles == null) { vnicProfiles = new ArrayList<VnicProfileView>(); } - Iterable<VnicInstanceType> values = model.getItems(); vnics.clear(); - if (values != null) { - for (VnicInstanceType value : values) { - vnics.add(value.getNetworkInterface()); - } - } super.init(model); - - realEntryCount = vnics.size() - 1; // don't count the ghost entry - updateHeaderLabel(); - } - - private void updateHeaderLabel() { - if (realEntryCount == 0) { - headerLabel.setText(messages.assignNicsNothingToAssign()); - } else if (realEntryCount == 1) { - headerLabel.setText(messages.assignNicsToProfilesSingular()); - } else { - headerLabel.setText(messages.assignNicsToProfilesPlural(realEntryCount)); - } - } - - @Override - protected void onAdd(VnicInstanceType value, ProfileInstanceTypeEditor widget) { - super.onAdd(value, widget); - ++realEntryCount; // necessarily a ghost entry, but this will be offset when the entry is toggled to ghost - updateHeaderLabel(); } @Override protected void onRemove(VnicInstanceType value, ProfileInstanceTypeEditor widget) { super.onRemove(value, widget); vnics.remove(value.getNetworkInterface()); - --realEntryCount; // necessarily a real entry - updateHeaderLabel(); } @Ignore @@ -126,9 +90,6 @@ protected void toggleGhost(VnicInstanceType value, ProfileInstanceTypeEditor item, boolean becomingGhost) { item.profileEditor.setEnabled(!becomingGhost); item.profileEditor.asWidget().setEnabled(true); - - realEntryCount += (becomingGhost ? -1 : 1); - updateHeaderLabel(); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.ui.xml index 680378b..3a2e4b7 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.ui.xml @@ -2,6 +2,8 @@ <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent";> <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <ui:with field='messages' type='org.ovirt.engine.ui.common.CommonApplicationMessages' /> + <ui:style type="org.ovirt.engine.ui.common.widget.AddRemoveRowWidget.WidgetStyle"> .mainPanel { border-top: 1px solid black; @@ -27,7 +29,7 @@ </ui:style> <g:FlowPanel addStyleNames="{style.mainPanel}" > - <g:Label ui:field="headerLabel" addStyleNames="{style.headerLabel}" /> + <g:Label ui:field="headerLabel" text="{messages.assignNics}" addStyleNames="{style.headerLabel}" /> <g:ScrollPanel height="190px"> <g:FlowPanel ui:field="contentPanel" /> </g:ScrollPanel> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index 3fad42d..81792fa 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -3161,7 +3161,7 @@ return diskInterfaces; } - public static String getNewNicName(List<VmNetworkInterface> existingInterfaces) + public static String getNewNicName(Collection<VmNetworkInterface> existingInterfaces) { int maxIfaceNumber = 0; if (existingInterfaces != null) -- To view, visit http://gerrit.ovirt.org/25550 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79d0d3d62f48c1d56292e65f5087a7a7100e118a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
