Kanagaraj M has uploaded a new change for review. Change subject: webadmin: refactored host/cluster general tab mode checks ......................................................................
webadmin: refactored host/cluster general tab mode checks With the recent enhancements to form related tabs, an empty line is shown for the form items which are not added to the formpanel. For example "libvirt version" form item won't be added to formpanel if the application is not running in virt supported mode. This leaves an empty line between the previous and next row's form items. The code is refactored to make use of the setIsAvailable() method of FormItem instead leaving out the formitem itself. Change-Id: I1e57336b819ee12b66d5f22589b4b85470e1be5c Bug-Url: https://bugzilla.redhat.com/973607 Signed-off-by: Kanagaraj M <[email protected]> --- 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/host/SubTabHostGeneralView.java 2 files changed, 57 insertions(+), 75 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/15947/1 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 787b80f..1d95b04 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 @@ -65,40 +65,43 @@ } }; + boolean virtSupported = ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly); + boolean glusterSupported = ApplicationModeHelper.isModeSupported(ApplicationMode.GlusterOnly); + formBuilder.addFormItem(new FormItem(constants.nameCluster(), name, 0, 0)); formBuilder.addFormItem(new FormItem(constants.descriptionCluster(), description, 1, 0)); - if (ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly) { - formBuilder.addFormItem(new FormItem(constants.dcCluster(), dataCenterName, 2, 0)); - } + formBuilder.addFormItem(new FormItem(constants.dcCluster(), dataCenterName, 2, 0)) + .setIsAvailable(virtSupported); formBuilder.addFormItem(new FormItem(constants.compatibilityVersionCluster(), compatibilityVersion, 3, 0)); // Show the cluster type only if the application is running in both the modes - if (ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly) - && ApplicationModeHelper.isModeSupported(ApplicationMode.GlusterOnly)) { - formBuilder.addFormItem(new FormItem(constants.clusterType(), clusterType, 4, 0)); - } + formBuilder.addFormItem(new FormItem(constants.clusterType(), clusterType, 4, 0)).setIsAvailable(virtSupported + && glusterSupported); // properties for virt support - if (ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly)) { - formBuilder.addFormItem(new FormItem(constants.cpuNameCluster(), cpuName, 0, 1) - .withDefaultValue(constants.notAvailableLabel(), virtServiceNotSupported)); - formBuilder.addFormItem(new FormItem(constants.cpuThreadsCluster(), cpuThreads, 1, 1) - .withDefaultValue(constants.notAvailableLabel(), virtServiceNotSupported)); - formBuilder.addFormItem(new FormItem(constants.memoryOptimizationCluster(), memoryOverCommit, 2, 1) - .withDefaultValue(constants.notAvailableLabel(), virtServiceNotSupported)); - formBuilder.addFormItem(new FormItem(constants.resiliencePolicyCluster(), resiliencePolicy, 3, 1) - .withDefaultValue(constants.notAvailableLabel(), virtServiceNotSupported)); - } + formBuilder.addFormItem(new FormItem(constants.cpuNameCluster(), cpuName, 0, 1) + .withDefaultValue(constants.notAvailableLabel(), virtServiceNotSupported)) + .setIsAvailable(virtSupported); + formBuilder.addFormItem(new FormItem(constants.cpuThreadsCluster(), cpuThreads, 1, 1) + .withDefaultValue(constants.notAvailableLabel(), virtServiceNotSupported)) + .setIsAvailable(virtSupported); + formBuilder.addFormItem(new FormItem(constants.memoryOptimizationCluster(), memoryOverCommit, 2, 1) + .withDefaultValue(constants.notAvailableLabel(), virtServiceNotSupported)) + .setIsAvailable(virtSupported); + formBuilder.addFormItem(new FormItem(constants.resiliencePolicyCluster(), resiliencePolicy, 3, 1) + .withDefaultValue(constants.notAvailableLabel(), virtServiceNotSupported)) + .setIsAvailable(virtSupported); // properties for gluster support - if (ApplicationModeHelper.isModeSupported(ApplicationMode.GlusterOnly)) { - formBuilder.addFormItem(new FormItem(constants.clusterVolumesTotalLabel(), noOfVolumesTotal, 0, 2) - .withDefaultValue(constants.notAvailableLabel(), glusterServiceNotSupported)); - formBuilder.addFormItem(new FormItem(constants.clusterVolumesUpLabel(), noOfVolumesUp, 1, 2) - .withDefaultValue(constants.notAvailableLabel(), glusterServiceNotSupported)); - formBuilder.addFormItem(new FormItem(constants.clusterVolumesDownLabel(), noOfVolumesDown, 2, 2) - .withDefaultValue(constants.notAvailableLabel(), glusterServiceNotSupported)); - } + formBuilder.addFormItem(new FormItem(constants.clusterVolumesTotalLabel(), noOfVolumesTotal, 0, 2) + .withDefaultValue(constants.notAvailableLabel(), glusterServiceNotSupported)) + .setIsAvailable(glusterSupported); + formBuilder.addFormItem(new FormItem(constants.clusterVolumesUpLabel(), noOfVolumesUp, 1, 2) + .withDefaultValue(constants.notAvailableLabel(), glusterServiceNotSupported)) + .setIsAvailable(glusterSupported); + formBuilder.addFormItem(new FormItem(constants.clusterVolumesDownLabel(), noOfVolumesDown, 2, 2) + .withDefaultValue(constants.notAvailableLabel(), glusterServiceNotSupported)) + .setIsAvailable(glusterSupported); } @Override 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 2bb5a6a..73bef80 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 @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.Iterator; import javax.inject.Inject; @@ -128,60 +127,40 @@ initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); driver.initialize(this); + boolean virtSupported = ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly); + // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 3, 7); - ArrayList<FormItem> formItems = new ArrayList<FormItem>(); + formBuilder.addFormItem(new FormItem(constants.osVersionHostGeneral(), oS, 0, 0)); + formBuilder.addFormItem(new FormItem(constants.kernelVersionHostGeneral(), kernelVersion, 1, 0)); + formBuilder.addFormItem(new FormItem(constants.kvmVersionHostGeneral(), kvmVersion, 2, 0)) + .setIsAvailable(virtSupported); + formBuilder.addFormItem(new FormItem(constants.libvirtVersionHostGeneral(), libvirtVersion, 3, 0)) + .setIsAvailable(virtSupported); + formBuilder.addFormItem(new FormItem(constants.vdsmVersionHostGeneral(), vdsmVersion, 4, 0)); + formBuilder.addFormItem(new FormItem(constants.spiceVersionHostGeneral(), spiceVersion, 5, 0)) + .setIsAvailable(virtSupported); + formBuilder.addFormItem(new FormItem(constants.isciInitNameHostGeneral(), iScsiInitiatorName, 6, 0)) + .setIsAvailable(virtSupported); - formItems.add(new FormItem(constants.osVersionHostGeneral(), oS, 0, 0)); - formItems.add(new FormItem(constants.kernelVersionHostGeneral(), kernelVersion, 1, 0)); - formItems.add(new FormItem(constants.kvmVersionHostGeneral(), kvmVersion, 2, 0)); - formItems.add(new FormItem(constants.libvirtVersionHostGeneral(), libvirtVersion, 3, 0)); - formItems.add(new FormItem(constants.vdsmVersionHostGeneral(), vdsmVersion, 4, 0)); - formItems.add(new FormItem(constants.spiceVersionHostGeneral(), spiceVersion, 5, 0)); - formItems.add(new FormItem(constants.isciInitNameHostGeneral(), iScsiInitiatorName, 6, 0)); + formBuilder.addFormItem(new FormItem(constants.spmPriority(), spmPriority, 0, 1)) + .setIsAvailable(virtSupported); + formBuilder.addFormItem(new FormItem(constants.activeVmsHostGeneral(), activeVms, 1, 1)) + .setIsAvailable(virtSupported); + formBuilder.addFormItem(new FormItem(constants.cpuNameHostGeneral(), cpuName, 2, 1)); + formBuilder.addFormItem(new FormItem(constants.cpuTypeHostGeneral(), cpuType, 3, 1)); + formBuilder.addFormItem(new FormItem(constants.numOfSocketsHostGeneral(), numberOfSockets, 4, 1)); + formBuilder.addFormItem(new FormItem(constants.numOfCoresPerSocketHostGeneral(), coresPerSocket, 5, 1)); + formBuilder.addFormItem(new FormItem(constants.numOfThreadsPerCoreHostGeneral(), threadsPerCore, 6, 1)); - formItems.add(new FormItem(constants.spmPriority(), spmPriority, 0, 1)); - formItems.add(new FormItem(constants.activeVmsHostGeneral(), activeVms, 1, 1)); - formItems.add(new FormItem(constants.cpuNameHostGeneral(), cpuName, 2, 1)); - formItems.add(new FormItem(constants.cpuTypeHostGeneral(), cpuType, 3, 1)); - formItems.add(new FormItem(constants.numOfSocketsHostGeneral(), numberOfSockets, 4, 1)); - formItems.add(new FormItem(constants.numOfCoresPerSocketHostGeneral(), coresPerSocket, 5, 1)); - formItems.add(new FormItem(constants.numOfThreadsPerCoreHostGeneral(), threadsPerCore, 6, 1)); - - formItems.add(new FormItem(constants.physMemHostGeneral(), physicalMemoryDetails, 0, 2)); - formItems.add(new FormItem(constants.swapSizeHostGeneral(), swapSizeDetails, 1, 2)); - formItems.add(new FormItem(constants.sharedMemHostGeneral(), sharedMemory, 2, 2)); - formItems.add(new FormItem(constants.maxSchedulingMemory(), maxSchedulingMemory, 3, 2)); - formItems.add(new FormItem(constants.memPageSharingHostGeneral(), memoryPageSharing, 4, 2)); - formItems.add(new FormItem(constants.autoLargePagesHostGeneral(), automaticLargePage, 5, 2)); - - applyModeCustomizations(formItems); - - for (FormItem formItem : formItems) - { - formBuilder.addFormItem(formItem); - } - } - - private void applyModeCustomizations(ArrayList<FormItem> formItems) - { - if (ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly) - { - return; - } - - Iterator<FormItem> iterator = formItems.iterator(); - while (iterator.hasNext()) - { - FormItem formItem = iterator.next(); - Widget widget = formItem.getValueWidget(); - if (widget == kvmVersion || widget == spiceVersion || widget == iScsiInitiatorName || widget == activeVms - || widget == libvirtVersion || widget == maxSchedulingMemory || widget == spmPriority) - { - iterator.remove(); - } - } + formBuilder.addFormItem(new FormItem(constants.physMemHostGeneral(), physicalMemoryDetails, 0, 2)); + formBuilder.addFormItem(new FormItem(constants.swapSizeHostGeneral(), swapSizeDetails, 1, 2)); + formBuilder.addFormItem(new FormItem(constants.sharedMemHostGeneral(), sharedMemory, 2, 2)); + formBuilder.addFormItem(new FormItem(constants.maxSchedulingMemory(), maxSchedulingMemory, 3, 2)) + .setIsAvailable(virtSupported); + formBuilder.addFormItem(new FormItem(constants.memPageSharingHostGeneral(), memoryPageSharing, 4, 2)); + formBuilder.addFormItem(new FormItem(constants.autoLargePagesHostGeneral(), automaticLargePage, 5, 2)); } void initMemorySizeLabels() { -- To view, visit http://gerrit.ovirt.org/15947 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e57336b819ee12b66d5f22589b4b85470e1be5c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
