Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: add element ids to all general subtabs ......................................................................
userportal, webadmin: add element ids to all general subtabs Change-Id: I8b281e7b130dd0bbcb23887719e79ab615a901d6 Signed-off-by: Greg Sheremeta <gsher...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/AbstractModelBoundFormWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolGeneralModelForm.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/template/SubTabExtendedTemplateGeneralView.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedPoolGeneralView.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGeneralView.java 20 files changed, 123 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/34800/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java index dbdb771..28a261d 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; +import org.ovirt.engine.ui.common.idhandler.HasElementId; import org.ovirt.engine.ui.common.utils.ElementIdUtils; import com.google.gwt.uibinder.client.UiField; @@ -18,9 +19,9 @@ /** * Represents a form panel that renders name/value items organized in columns. */ -public abstract class AbstractFormPanel extends Composite { +public abstract class AbstractFormPanel extends Composite implements HasElementId { - protected String elementIdPrefix = DOM.createUniqueId(); + protected String elementId = DOM.createUniqueId(); @UiField public HorizontalPanel contentPanel; @@ -93,17 +94,17 @@ // set item ids view.getWidget(item.getRow(), 0).getElement().setId( - ElementIdUtils.createFormGridElementId(elementIdPrefix, item.getColumn(), item.getRow(), "_label")); //$NON-NLS-1$ + ElementIdUtils.createFormGridElementId(elementId, item.getColumn(), item.getRow(), "_label")); //$NON-NLS-1$ view.getWidget(item.getRow(), 1).getElement().setId( - ElementIdUtils.createFormGridElementId(elementIdPrefix, item.getColumn(), item.getRow(), "_value")); //$NON-NLS-1$ + ElementIdUtils.createFormGridElementId(elementId, item.getColumn(), item.getRow(), "_value")); //$NON-NLS-1$ } Grid getDetailView(int column) { return detailViews.get(column); } - public void setElementIdPrefix(String elementIdPrefix) { - this.elementIdPrefix = elementIdPrefix; + public void setElementId(String elementId) { + this.elementId = elementId; } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/AbstractModelBoundFormWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/AbstractModelBoundFormWidget.java index bf4f88b..6eab0c4 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/AbstractModelBoundFormWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/AbstractModelBoundFormWidget.java @@ -50,8 +50,7 @@ public void setElementId(String elementId) { this.getElement().setId(elementId); - // set id prefix for any children that need it - this.formPanel.setElementIdPrefix(elementId); + formPanel.setElementId(elementId); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java index fe024f8..ac1f391 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java @@ -39,11 +39,22 @@ @Ignore TextBoxLabel isStateless = new TextBoxLabel(); + CommonApplicationConstants constants; + private final Driver driver = GWT.create(Driver.class); public TemplateGeneralModelForm(ModelProvider<TemplateGeneralModel> modelProvider, CommonApplicationConstants constants) { super(modelProvider, 3, 6); + this.constants = constants; + } + + /** + * Initialize the form. Call this after ID has been set on the form, + * so that form fields can use the ID as their prefix. + */ + public void initialize() { + driver.initialize(this); isHighlyAvailable = new BooleanLabel(constants.yes(), constants.no()); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolGeneralModelForm.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolGeneralModelForm.java index 7ba0f12..ce62843 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolGeneralModelForm.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolGeneralModelForm.java @@ -31,10 +31,21 @@ @Ignore TextBoxLabel monitorCount = new TextBoxLabel(); + CommonApplicationConstants constants; + private final Driver driver = GWT.create(Driver.class); public PoolGeneralModelForm(ModelProvider<PoolGeneralModel> modelProvider, CommonApplicationConstants constants) { super(modelProvider, 3, 5); + this.constants = constants; + } + + /** + * Initialize the form. Call this after ID has been set on the form, + * so that form fields can use the ID as their prefix. + */ + public void initialize() { + driver.initialize(this); formBuilder.addFormItem(new FormItem(constants.namePoolGeneral(), name, 0, 0)); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java index 4e74816..51d197c 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java @@ -43,10 +43,21 @@ @Ignore TextBoxLabel monitorCount = new TextBoxLabel(); + CommonApplicationConstants constants; + private final Driver driver = GWT.create(Driver.class); public VmGeneralModelForm(ModelProvider<VmGeneralModel> modelProvider, CommonApplicationConstants constants) { super(modelProvider, 3, 8); + this.constants = constants; + } + + /** + * Initialize the form. Call this after ID has been set on the form, + * so that form fields can use the ID as their prefix. + */ + public void initialize() { + isHighlyAvailable = new BooleanLabel(constants.yes(), constants.no()); driver.initialize(this); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/template/SubTabExtendedTemplateGeneralView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/template/SubTabExtendedTemplateGeneralView.java index fd2105a..6ce2aea 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/template/SubTabExtendedTemplateGeneralView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/template/SubTabExtendedTemplateGeneralView.java @@ -2,6 +2,7 @@ import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.uicommon.template.TemplateGeneralModelForm; import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateGeneralModel; @@ -28,6 +29,7 @@ } @UiField(provided = true) + @WithElementId TemplateGeneralModelForm form; @Inject @@ -35,6 +37,10 @@ super(modelProvider); form = new TemplateGeneralModelForm(modelProvider, constants); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); + + generateIds(); + + form.initialize(); } @Override diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedPoolGeneralView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedPoolGeneralView.java index c3c0699..af5e888 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedPoolGeneralView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedPoolGeneralView.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.userportal.section.main.view.tab.extended.vm; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.uicommon.vm.PoolGeneralModelForm; import org.ovirt.engine.ui.uicommonweb.models.pools.PoolGeneralModel; @@ -28,6 +29,7 @@ } @UiField(provided = true) + @WithElementId PoolGeneralModelForm form; @Inject @@ -35,6 +37,10 @@ super(modelProvider); form = new PoolGeneralModelForm(modelProvider, constants); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); + + generateIds(); + + form.initialize(); } @Override diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmGeneralView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmGeneralView.java index d0b79bb..ad66a8a 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmGeneralView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/vm/SubTabExtendedVmGeneralView.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.userportal.section.main.view.tab.extended.vm; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.uicommon.vm.VmGeneralModelForm; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalItemModel; @@ -28,6 +29,7 @@ } @UiField(provided = true) + @WithElementId VmGeneralModelForm form; @Inject @@ -35,6 +37,10 @@ super(modelProvider); form = new VmGeneralModelForm(modelProvider, constants); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); + + generateIds(); + + form.initialize(); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java index 37d45b8..e365c47 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java @@ -1,7 +1,6 @@ package org.ovirt.engine.ui.webadmin.section.main.view.tab.cluster; import org.ovirt.engine.core.common.mode.ApplicationMode; -import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.uicommon.model.ModelProvider; import org.ovirt.engine.ui.common.widget.form.FormItem; import org.ovirt.engine.ui.common.widget.form.FormItem.DefaultValueCondition; @@ -23,10 +22,6 @@ interface Driver extends SimpleBeanEditorDriver<ClusterGeneralModel, ClusterGeneralModelForm> { } - interface ViewIdHandler extends ElementIdHandler<ClusterGeneralModelForm> { - ViewIdHandler idHandler = GWT.create(ViewIdHandler.class); - } - TextBoxLabel name = new TextBoxLabel(); TextBoxLabel description = new TextBoxLabel(); TextBoxLabel dataCenterName = new TextBoxLabel(); @@ -42,12 +37,23 @@ TextBoxLabel emulatedMachine = new TextBoxLabel(); TextBoxLabel numberOfVms = new TextBoxLabel(); + ModelProvider<ClusterGeneralModel> modelProvider; + ApplicationConstants constants; + private final Driver driver = GWT.create(Driver.class); public ClusterGeneralModelForm(ModelProvider<ClusterGeneralModel> modelProvider, final ApplicationConstants constants) { super(modelProvider, 3, 6); - ViewIdHandler.idHandler.generateAndSetIds(this); + this.modelProvider = modelProvider; + this.constants = constants; + } + + /** + * Initialize the form. Call this after ID has been set on the form, + * so that form fields can use the ID as their prefix. + */ + public void initialize() { cpuThreads = new BooleanLabel(constants.yes(), constants.no()); memoryOverCommit = new PercentLabel<Integer>(); resiliencePolicy = new ResiliencePolicyLabel(constants); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java index 2ea41fa..25c0575 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java @@ -5,6 +5,7 @@ import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.gluster.GlusterServiceStatus; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.UiCommandButton; @@ -57,6 +58,7 @@ @UiField(provided = true) @Ignore + @WithElementId ClusterGeneralModelForm form; FormBuilder formBuilder; @@ -90,11 +92,20 @@ // Inject a reference to the resources: this.resources = resources; + this.form = new ClusterGeneralModelForm(modelProvider, constants); + + // generate ids + generateIds(); + + // init form + form.initialize(); + glusterSwiftStatusEditor = new EntityModelLabelEditor<GlusterServiceStatus>( new EnumRenderer<GlusterServiceStatus>()); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); + initManageGlusterSwift(); localize(); addStyles(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java index 5306f5b..bd4aa1b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java @@ -4,6 +4,7 @@ import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.form.FormBuilder; @@ -45,6 +46,7 @@ TextBoxLabel alignment = new TextBoxLabel(); @UiField(provided = true) + @WithElementId GeneralFormPanel formPanel; FormBuilder formBuilder; @@ -63,6 +65,8 @@ initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); driver.initialize(this); + generateIds(); + // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 1, 7); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java index fa13fd2..ea2b846 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java @@ -4,6 +4,7 @@ import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.form.FormBuilder; @@ -36,6 +37,7 @@ } @UiField(provided = true) + @WithElementId GeneralFormPanel formPanel; TextBoxLabel name = new TextBoxLabel(); @@ -63,6 +65,8 @@ initWidget(formPanel); driver.initialize(this); + generateIds(); + // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 1, 7); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java index 0e5ae55..ce31cbe 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java @@ -9,6 +9,7 @@ import org.ovirt.engine.core.common.businessentities.VdsTransparentHugePagesState; import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.form.FormBuilder; @@ -102,6 +103,7 @@ EnumTextBoxLabel<VdsTransparentHugePagesState> automaticLargePage = new EnumTextBoxLabel<VdsTransparentHugePagesState>(); @UiField(provided = true) + @WithElementId GeneralFormPanel formPanel; FormBuilder formBuilder; @@ -139,6 +141,8 @@ initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); driver.initialize(this); + generateIds(); + boolean virtSupported = ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly); boolean glusterSupported = ApplicationModeHelper.isModeSupported(ApplicationMode.GlusterOnly); @@ -170,6 +174,7 @@ formBuilder.addFormItem(new FormItem(constants.autoLargePagesHostGeneral(), automaticLargePage, 2).withAutoPlacement()); formBuilder.addFormItem(new FormItem(constants.selinuxModeGeneral(), selinuxEnforceMode, 2).withAutoPlacement()); formBuilder.addFormItem(new FormItem(constants.liveSnapshotSupportHostGeneral(), liveSnapshotSupport, 2).withAutoPlacement()); + } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java index c1a6b28..b887d74 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java @@ -4,6 +4,7 @@ import org.ovirt.engine.core.common.businessentities.network.NetworkView; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.form.FormBuilder; @@ -51,6 +52,7 @@ TextBoxLabel externalId = new TextBoxLabel(); @UiField(provided = true) + @WithElementId GeneralFormPanel formPanel; FormBuilder formBuilder; @@ -67,6 +69,8 @@ initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); driver.initialize(this); + generateIds(); + // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 2, 4); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java index 9738e90..5785c91 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java @@ -4,6 +4,7 @@ import org.ovirt.engine.core.common.businessentities.VmPool; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.form.FormBuilder; @@ -59,6 +60,7 @@ TextBoxLabel monitorCount = new TextBoxLabel(); @UiField(provided = true) + @WithElementId GeneralFormPanel formPanel; FormBuilder formBuilder; @@ -75,6 +77,8 @@ initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); driver.initialize(this); + generateIds(); + // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 3, 6); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java index 358cce8..b188f25 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java @@ -5,6 +5,7 @@ import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.ProviderType; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.form.FormBuilder; @@ -47,6 +48,7 @@ TextBoxLabel url = new TextBoxLabel(); @UiField(provided = true) + @WithElementId GeneralFormPanel formPanel; FormBuilder formBuilder; @@ -61,6 +63,8 @@ initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); driver.initialize(this); + generateIds(); + // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 1, 4); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java index 853291e..d23fd5b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageGeneralView.java @@ -3,6 +3,7 @@ import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.form.FormBuilder; @@ -71,6 +72,7 @@ TextBoxLabel timeout = new TextBoxLabel(); @UiField(provided = true) + @WithElementId GeneralFormPanel formPanel; FormBuilder formBuilder; @@ -88,6 +90,8 @@ initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); driver.initialize(this); + generateIds(); + // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 1, 12); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateGeneralView.java index f60e02e..607bbb2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateGeneralView.java @@ -2,6 +2,7 @@ import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.uicommon.template.TemplateGeneralModelForm; @@ -28,6 +29,7 @@ } @UiField(provided = true) + @WithElementId TemplateGeneralModelForm form; @Inject @@ -35,6 +37,10 @@ super(modelProvider); this.form = new TemplateGeneralModelForm(modelProvider, constants); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); + + generateIds(); + + form.initialize(); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java index 38207d5..7c9f39c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java @@ -4,6 +4,7 @@ import org.ovirt.engine.core.common.businessentities.aaa.DbUser; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.form.FormBuilder; @@ -43,6 +44,7 @@ TextBoxLabel email = new TextBoxLabel(); @UiField(provided = true) + @WithElementId GeneralFormPanel formPanel; FormBuilder formBuilder; @@ -59,6 +61,8 @@ initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); driver.initialize(this); + generateIds(); + // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 1, 3); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGeneralView.java index 78cff4e..1091245 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/virtualMachine/SubTabVirtualMachineGeneralView.java @@ -65,6 +65,8 @@ clearAlerts(); generateIds(); + + form.initialize(); } @Override -- To view, visit http://gerrit.ovirt.org/34800 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b281e7b130dd0bbcb23887719e79ab615a901d6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <gsher...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches