anmolbabu has uploaded a new change for review. Change subject: webadmin : Removing instead of hiding virt-related fields in the host->general sub-tab ......................................................................
webadmin : Removing instead of hiding virt-related fields in the host->general sub-tab Removing instead of hiding virt-related fields in the host -> general sub-tab and hence fix the allignment issues Change-Id: I770547907c681a4648999c9d0d3d3ff7aba93971 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1025101 Signed-off-by: Anmol Babu <anb...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormBuilder.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormItem.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java 3 files changed, 72 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/22220/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormBuilder.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormBuilder.java index 736658b..b97ca6a 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormBuilder.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormBuilder.java @@ -31,20 +31,45 @@ } } + Map<Integer, Integer> firstEmptyRowOfColumns; + /** * Adds new item to the form panel. */ public FormItem addFormItem(FormItem item) { - formPanel.addFormItem(item); - items.add(item); + formPanel.addFormItem(item); + items.add(item); - // Update property name mapping, if necessary - String isAvailablePropertyName = item.getIsAvailablePropertyName(); - if (isAvailablePropertyName != null) { - getItemsForPropertyName(isAvailablePropertyName).add(item); + // Update property name mapping, if necessary + String isAvailablePropertyName = item.getIsAvailablePropertyName(); + if (isAvailablePropertyName != null) { + getItemsForPropertyName(isAvailablePropertyName).add(item); + } + + return item; + } + + public FormItem addFormItem(int column, FormItem item) { + if (item.getIsAvailable()) { + item.setRow(getNextRow(column)); + item.setColumn(column); + return addFormItem(item); } + return null; + } - return item; + public int getNextRow(int column) { + int curRow; + if(firstEmptyRowOfColumns == null) { + firstEmptyRowOfColumns = new HashMap<Integer, Integer>(); + } + if(!firstEmptyRowOfColumns.containsKey(column)) { + firstEmptyRowOfColumns.put(column, 0); + } + curRow = firstEmptyRowOfColumns.get(column); + firstEmptyRowOfColumns.put(column, curRow+1); + + return curRow; } List<FormItem> getItemsForPropertyName(String propertyName) { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormItem.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormItem.java index 949651e..3e2b906 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormItem.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/FormItem.java @@ -20,10 +20,14 @@ private AbstractFormPanel formPanel; - private final int row; - private final int column; + private int row; + private int column; - private final String isAvailablePropertyName; + public void setColumn(int column) { + this.column = column; + } + + private String isAvailablePropertyName; private boolean isAvailable = true; private String name; @@ -32,6 +36,18 @@ private TextBoxLabel defaultValueLabel; private DefaultValueCondition defaultValueCondition; + public FormItem(String name, Widget valueWidget) { + this(name, valueWidget, 0, 0, null, true); + } + + public FormItem(String name, Widget valueWidget, boolean isAvailable) { + this(name, valueWidget, 0, 0, null, isAvailable); + } + + public void setRow(int row) { + this.row = row; + } + public FormItem(int row, int column) { this("", new TextBoxLabel(), row, column); //$NON-NLS-1$ } 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 fc8d4f3..ec2feae 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 @@ -136,29 +136,29 @@ // Build a form using the FormBuilder formBuilder = new FormBuilder(formPanel, 3, 7); - 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, virtSupported)); - formBuilder.addFormItem(new FormItem(constants.libvirtVersionHostGeneral(), libvirtVersion, 3, 0, virtSupported)); - formBuilder.addFormItem(new FormItem(constants.vdsmVersionHostGeneral(), vdsmVersion, 4, 0)); - formBuilder.addFormItem(new FormItem(constants.spiceVersionHostGeneral(), spiceVersion, 5, 0, virtSupported)); - formBuilder.addFormItem(new FormItem(constants.glusterVersionHostGeneral(), glusterVersion, 6, 0, glusterSupported)); + formBuilder.addFormItem(0, new FormItem(constants.osVersionHostGeneral(), oS)); + formBuilder.addFormItem(0, new FormItem(constants.kernelVersionHostGeneral(), kernelVersion)); + formBuilder.addFormItem(0, new FormItem(constants.kvmVersionHostGeneral(), kvmVersion, virtSupported)); + formBuilder.addFormItem(0, new FormItem(constants.libvirtVersionHostGeneral(), libvirtVersion, virtSupported)); + formBuilder.addFormItem(0, new FormItem(constants.vdsmVersionHostGeneral(), vdsmVersion)); + formBuilder.addFormItem(0, new FormItem(constants.spiceVersionHostGeneral(), spiceVersion, virtSupported)); + formBuilder.addFormItem(0, new FormItem(constants.glusterVersionHostGeneral(), glusterVersion, glusterSupported)); - formBuilder.addFormItem(new FormItem(constants.spmPriority(), spmPriority, 0, 1, virtSupported)); - formBuilder.addFormItem(new FormItem(constants.activeVmsHostGeneral(), activeVms, 1, 1, virtSupported)); - formBuilder.addFormItem(new FormItem(constants.cpuNameHostGeneral(), cpuName, 2, 1, virtSupported)); - 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)); + formBuilder.addFormItem(1, new FormItem(constants.spmPriority(), spmPriority, virtSupported)); + formBuilder.addFormItem(1, new FormItem(constants.activeVmsHostGeneral(), activeVms, virtSupported)); + formBuilder.addFormItem(1, new FormItem(constants.cpuNameHostGeneral(), cpuName, virtSupported)); + formBuilder.addFormItem(1, new FormItem(constants.cpuTypeHostGeneral(), cpuType)); + formBuilder.addFormItem(1, new FormItem(constants.numOfSocketsHostGeneral(), numberOfSockets)); + formBuilder.addFormItem(1, new FormItem(constants.numOfCoresPerSocketHostGeneral(), coresPerSocket)); + formBuilder.addFormItem(1, new FormItem(constants.numOfThreadsPerCoreHostGeneral(), threadsPerCore)); - 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, virtSupported)); - formBuilder.addFormItem(new FormItem(constants.memPageSharingHostGeneral(), memoryPageSharing, 4, 2)); - formBuilder.addFormItem(new FormItem(constants.autoLargePagesHostGeneral(), automaticLargePage, 5, 2)); - formBuilder.addFormItem(new FormItem(constants.isciInitNameHostGeneral(), iScsiInitiatorName, 6, 2, virtSupported)); + formBuilder.addFormItem(2, new FormItem(constants.physMemHostGeneral(), physicalMemoryDetails)); + formBuilder.addFormItem(2, new FormItem(constants.swapSizeHostGeneral(), swapSizeDetails)); + formBuilder.addFormItem(2, new FormItem(constants.sharedMemHostGeneral(), sharedMemory)); + formBuilder.addFormItem(2, new FormItem(constants.maxSchedulingMemory(), maxSchedulingMemory, virtSupported)); + formBuilder.addFormItem(2, new FormItem(constants.memPageSharingHostGeneral(), memoryPageSharing)); + formBuilder.addFormItem(2, new FormItem(constants.autoLargePagesHostGeneral(), automaticLargePage)); + formBuilder.addFormItem(2, new FormItem(constants.isciInitNameHostGeneral(), iScsiInitiatorName, virtSupported)); } void initMemorySizeLabels() { -- To view, visit http://gerrit.ovirt.org/22220 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I770547907c681a4648999c9d0d3d3ff7aba93971 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <anb...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
