Artyom Lukianov has uploaded a new change for review. Change subject: webadmin: Cahnge affinity popup window to radio buttons style ......................................................................
webadmin: Cahnge affinity popup window to radio buttons style Change-Id: I428462ba448440cb3cde879f8bd4fff34a7b2f30 Bug-Url: https://bugzilla.redhat.com/1057487 Signed-off-by: alukiano <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/affinity_groups/model/AffinityGroupModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/affinity_groups/model/EditAffinityGroupModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.ui.xml 4 files changed, 76 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/27030/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/affinity_groups/model/AffinityGroupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/affinity_groups/model/AffinityGroupModel.java index c6151fb..2d18376 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/affinity_groups/model/AffinityGroupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/affinity_groups/model/AffinityGroupModel.java @@ -25,6 +25,7 @@ import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult; import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback; +import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; public abstract class AffinityGroupModel extends Model { private final AffinityGroup affinityGroup; @@ -34,7 +35,9 @@ private EntityModel<String> name; private EntityModel<String> description; private EntityModel<Boolean> positive; - private EntityModel<Boolean> enforcing; + private EntityModel<Boolean> negative; + private EntityModel<Boolean> hard; + private EntityModel<Boolean> soft; private VmsSelectionModel vmsSelectionModel; private final Guid clusterId; private final String clusterName; @@ -52,7 +55,9 @@ setName(new EntityModel<String>()); setDescription(new EntityModel<String>()); setPositive(new EntityModel<Boolean>(true)); - setEnforcing(new EntityModel<Boolean>(true)); + setNegative(new EntityModel<Boolean>(false)); + setHard(new EntityModel<Boolean>(true)); + setSoft(new EntityModel<Boolean>(false)); setVmsSelectionModel(new VmsSelectionModel()); @@ -113,12 +118,28 @@ this.positive = positive; } - public EntityModel<Boolean> getEnforcing() { - return enforcing; + public EntityModel<Boolean> getNegative() { + return negative; } - private void setEnforcing(EntityModel<Boolean> enforcing) { - this.enforcing = enforcing; + private void setNegative(EntityModel<Boolean> negative) { + this.negative = negative; + } + + public EntityModel<Boolean> getHard() { + return hard; + } + + private void setHard(EntityModel<Boolean> hard) { + this.hard = hard; + } + + public EntityModel<Boolean> getSoft() { + return soft; + } + + private void setSoft(EntityModel<Boolean> soft) { + this.soft = soft; } public VmsSelectionModel getVmsSelectionModel() { @@ -146,8 +167,18 @@ group.setName(getName().getEntity()); group.setDescription(getDescription().getEntity()); group.setClusterId(clusterId); - group.setEnforcing(getEnforcing().getEntity()); - group.setPositive(getPositive().getEntity()); + if (getHard().getEntity()) { + group.setEnforcing(getHard().getEntity()); + } + if (getSoft().getEntity()){ + group.setEnforcing(!getSoft().getEntity()); + } + if (getPositive().getEntity()){ + group.setPositive(getPositive().getEntity()); + } + if (getNegative().getEntity()){ + group.setPositive(!getNegative().getEntity()); + } group.setEntityIds(getVmsSelectionModel().getSelectedVmIds()); startProgress(null); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/affinity_groups/model/EditAffinityGroupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/affinity_groups/model/EditAffinityGroupModel.java index 1f985ef..ffdbc00 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/affinity_groups/model/EditAffinityGroupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/affinity_groups/model/EditAffinityGroupModel.java @@ -21,7 +21,9 @@ getName().setEntity(getAffinityGroup().getName()); getPositive().setEntity(getAffinityGroup().isPositive()); - getEnforcing().setEntity(getAffinityGroup().isEnforcing()); + getNegative().setEntity(!getAffinityGroup().isPositive()); + getHard().setEntity(getAffinityGroup().isEnforcing()); + getSoft().setEntity(!getAffinityGroup().isEnforcing()); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.java index a06a2c9..b0157eb 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.java @@ -3,9 +3,8 @@ import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; -import org.ovirt.engine.ui.common.widget.Align; import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel; -import org.ovirt.engine.ui.common.widget.editor.generic.EntityModelCheckBoxEditor; +import org.ovirt.engine.ui.common.widget.editor.generic.EntityModelRadioButtonEditor; import org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelTextBoxEditor; import org.ovirt.engine.ui.common.widget.form.key_value.KeyValueWidget; import org.ovirt.engine.ui.uicommonweb.models.configure.scheduling.affinity_groups.VmsSelectionModel; @@ -48,12 +47,23 @@ @UiField(provided = true) @Path(value = "positive.entity") @WithElementId("positive") - EntityModelCheckBoxEditor positiveEditor; + EntityModelRadioButtonEditor positive; @UiField(provided = true) - @Path(value = "enforcing.entity") - @WithElementId("enforcing") - EntityModelCheckBoxEditor enforcingEditor; + @Path(value = "negative.entity") + @WithElementId("negative") + EntityModelRadioButtonEditor negative; + + @UiField(provided = true) + @Path(value = "hard.entity") + @WithElementId("hard") + EntityModelRadioButtonEditor hard; + + @UiField(provided = true) + @Path(value = "soft.entity") + @WithElementId("soft") + EntityModelRadioButtonEditor soft; + @UiField(provided = true) @Ignore @@ -64,7 +74,7 @@ ApplicationResources resources, ApplicationConstants constants) { super(eventBus, resources); - initCheckBoxEditors(); + initRadioButtonsEditors(); initAddRemoveWidget(); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); ViewIdHandler.idHandler.generateAndSetIds(this); @@ -76,16 +86,20 @@ addRemoveVmWidget = new KeyValueWidget<VmsSelectionModel>("120px"); //$NON-NLS-1$ } - private void initCheckBoxEditors() { - positiveEditor = new EntityModelCheckBoxEditor(Align.RIGHT); - enforcingEditor = new EntityModelCheckBoxEditor(Align.RIGHT); + private void initRadioButtonsEditors() { + positive = new EntityModelRadioButtonEditor("1"); //$NON-NLS-1$ + negative = new EntityModelRadioButtonEditor("1"); //$NON-NLS-1$ + hard = new EntityModelRadioButtonEditor("2"); //$NON-NLS-1$ + soft = new EntityModelRadioButtonEditor("2"); //$NON-NLS-1$ } private void localize(ApplicationConstants constants) { nameEditor.setLabel(constants.affinityGroupNameLabel()); descriptionEditor.setLabel(constants.affinityDescriptionLabel()); - positiveEditor.setLabel(constants.affinityGroupPolarityLabel()); - enforcingEditor.setLabel(constants.affinityGroupEnforceTypeLabel()); + positive.setLabel(constants.positiveAffinity()); + negative.setLabel(constants.negativeAffinity()); + hard.setLabel(constants.hardEnforcingAffinity()); + soft.setLabel(constants.softEnforcingAffinity()); } public void edit(AffinityGroupModel model) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.ui.xml index 1e5f362..0c208cd 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.ui.xml @@ -12,8 +12,14 @@ <g:FlowPanel> <ge:StringEntityModelTextBoxEditor ui:field="nameEditor" /> <ge:StringEntityModelTextBoxEditor ui:field="descriptionEditor" /> - <ge:EntityModelCheckBoxEditor ui:field="positiveEditor" /> - <ge:EntityModelCheckBoxEditor ui:field="enforcingEditor" /> + <g:HorizontalPanel> + <ge:EntityModelRadioButtonEditor ui:field="positive" width="200px"/> + <ge:EntityModelRadioButtonEditor ui:field="negative" width="200px"/> + </g:HorizontalPanel> + <g:HorizontalPanel> + <ge:EntityModelRadioButtonEditor ui:field="hard" width="200px"/> + <ge:EntityModelRadioButtonEditor ui:field="soft" width="200px"/> + </g:HorizontalPanel> <k:KeyValueWidget ui:field="addRemoveVmWidget" width="300px" height="150px" /> </g:FlowPanel> </d:content> -- To view, visit http://gerrit.ovirt.org/27030 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I428462ba448440cb3cde879f8bd4fff34a7b2f30 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Artyom Lukianov <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
