Frank Kobzik has uploaded a new change for review. Change subject: frontend: Clarify CPU labels in cluster views ......................................................................
frontend: Clarify CPU labels in cluster views Follow-up to I5137dbb61dcc07dc7d5ccced390d94ddc1c9ba4e This patch clarifies naming of cpu labels in cluster views in a similar way as I5137dbb61dcc07dc7d5ccced390d94ddc1c9ba4e. Change-Id: I7e1ada013b0ad470de9c959f9ae457f1d43fd51b Signed-off-by: Frantisek Kobzik <fkob...@redhat.com> Bug-Url: https://bugzilla.redhat.com/1012984 --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java 8 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/20114/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java index f7492d8..2b35916 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java @@ -152,7 +152,7 @@ private String name; private String description; - private String cpuName; + private String cpuType; private String dataCenterName; private String compatibilityVersion; private int memoryOverCommit; @@ -221,7 +221,7 @@ setName(vdsGroup.getName()); setDescription(vdsGroup.getdescription()); - setCpuName(vdsGroup.getcpu_name()); + setCpuType(vdsGroup.getcpu_name()); setDataCenterName(vdsGroup.getStoragePoolName()); setMemoryOverCommit(vdsGroup.getmax_vds_memory_over_commit()); setCpuThreads(vdsGroup.getCountThreadsAsCores()); @@ -740,12 +740,12 @@ this.description = description; } - public String getCpuName() { - return cpuName; + public String getCpuType() { + return cpuType; } - public void setCpuName(String cpuName) { - this.cpuName = cpuName; + public void setCpuType(String cpuType) { + this.cpuType = cpuType; } public String getDataCenterName() { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index a4c6112..22e85ca 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -667,8 +667,8 @@ @DefaultStringValue("Description") String clusterPopupDescriptionLabel(); - @DefaultStringValue("CPU Name") - String clusterPopupCPULabel(); + @DefaultStringValue("CPU Type") + String clusterPopupCPUTypeLabel(); @DefaultStringValue("Compatibility Version") String clusterPopupVersionLabel(); @@ -1167,7 +1167,7 @@ String descriptionCluster(); @DefaultStringValue("Cluster CPU Type") - String cpuNameCluster(); + String cpuTypeCluster(); @DefaultStringValue("New") String newCluster(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java index f905e1f..539d253 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java @@ -92,7 +92,7 @@ @UiField(provided = true) @Path(value = "CPU.selectedItem") @WithElementId - ListModelListBoxEditor<Object> cPUEditor; + ListModelListBoxEditor<Object> cpuEditor; @UiField(provided = true) @Path(value = "version.selectedItem") @@ -292,7 +292,7 @@ nameEditor.setLabel(constants.clusterPopupNameLabel()); descriptionEditor.setLabel(constants.clusterPopupDescriptionLabel()); commentEditor.setLabel(constants.commentLabel()); - cPUEditor.setLabel(constants.clusterPopupCPULabel()); + cpuEditor.setLabel(constants.clusterPopupCPUTypeLabel()); versionEditor.setLabel(constants.clusterPopupVersionLabel()); enableOvirtServiceEditor.setLabel(constants.clusterEnableOvirtServiceLabel()); enableGlusterServiceEditor.setLabel(constants.clusterEnableGlusterServiceLabel()); @@ -350,7 +350,7 @@ } }); - cPUEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { + cpuEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { @Override public String renderNullSafe(Object object) { return ((ServerCpu) object).getCpuName(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml index 184d520..1ebefa8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml @@ -151,7 +151,7 @@ <e:EntityModelTextBoxEditor ui:field="nameEditor" /> <e:EntityModelTextBoxEditor ui:field="descriptionEditor" /> <e:EntityModelTextBoxEditor ui:field="commentEditor" /> - <e:ListModelListBoxEditor ui:field="cPUEditor" /> + <e:ListModelListBoxEditor ui:field="cpuEditor" /> <e:ListModelListBoxEditor ui:field="versionEditor" /> <g:VerticalPanel ui:field="servicesCheckboxPanel"> <e:EntityModelCheckBoxEditor ui:field="enableOvirtServiceEditor" /> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java index b253830..b7c54ef 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java @@ -109,7 +109,7 @@ @UiField(provided = true) @Path(value = "cluster.CPU.selectedItem") @WithElementId - ListModelListBoxEditor<Object> clusterCpuNameEditor; + ListModelListBoxEditor<Object> clusterCpuTypeEditor; @UiField Anchor storageButton; @@ -236,7 +236,7 @@ } }); - clusterCpuNameEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { + clusterCpuTypeEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { @Override public String renderNullSafe(Object object) { return ((ServerCpu) object).getCpuName(); @@ -280,7 +280,7 @@ clusterButton.setText(getConstants().editText()); clusterNameEditor.setLabel(getConstants().clusterPopupNameLabel()); clusterDescriptionEditor.setLabel(getConstants().clusterPopupDescriptionLabel()); - clusterCpuNameEditor.setLabel(getConstants().clusterPopupCPULabel()); + clusterCpuTypeEditor.setLabel(getConstants().clusterPopupCPUTypeLabel()); storageButton.setText(getConstants().editText()); storageNameEditor.setLabel(getConstants().storagePopupNameLabel()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.ui.xml index d3c487a..1fa22c0 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.ui.xml @@ -99,7 +99,7 @@ <e:EntityModelTextBoxEditor ui:field="clusterNameEditor" /> <g:VerticalPanel ui:field="clusterPanel" addStyleNames="{style.verticalPanelStyle}"> <e:EntityModelTextBoxEditor ui:field="clusterDescriptionEditor" /> - <e:ListModelListBoxEditor ui:field="clusterCpuNameEditor" /> + <e:ListModelListBoxEditor ui:field="clusterCpuTypeEditor" /> </g:VerticalPanel> </g:VerticalPanel> <g:Anchor ui:field="clusterButton" styleName="{style.toggleButtonStyle}" /> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java index 886274c..c6c7408 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java @@ -78,13 +78,13 @@ getTable().addColumn(descColumn, constants.descriptionCluster(), "300px"); //$NON-NLS-1$ if (ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly) { - TextColumnWithTooltip<VDSGroup> cpuNameColumn = new TextColumnWithTooltip<VDSGroup>() { + TextColumnWithTooltip<VDSGroup> cpuTypeColumn = new TextColumnWithTooltip<VDSGroup>() { @Override public String getValue(VDSGroup object) { return object.getcpu_name(); } }; - getTable().addColumn(cpuNameColumn, constants.cpuNameCluster(), "150px"); //$NON-NLS-1$ + getTable().addColumn(cpuTypeColumn, constants.cpuTypeCluster(), "150px"); //$NON-NLS-1$ } getTable().addColumn(new CommentColumn<VDSGroup>(), constants.commentLabel(), "100px"); //$NON-NLS-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 a66a0a9..e978abd 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 @@ -25,7 +25,7 @@ TextBoxLabel name = new TextBoxLabel(); TextBoxLabel description = new TextBoxLabel(); TextBoxLabel dataCenterName = new TextBoxLabel(); - TextBoxLabel cpuName = new TextBoxLabel(); + TextBoxLabel cpuType = new TextBoxLabel(); BooleanLabel cpuThreads; MemorySizeLabel<Integer> memoryOverCommit; ResiliencePolicyLabel resiliencePolicy; @@ -79,7 +79,7 @@ && glusterSupported)); // properties for virt support - formBuilder.addFormItem(new FormItem(constants.cpuNameCluster(), cpuName, 0, 1, virtSupported) + formBuilder.addFormItem(new FormItem(constants.cpuTypeCluster(), cpuType, 0, 1, virtSupported) .withDefaultValue(constants.notAvailableLabel(), virtServiceNotSupported)); formBuilder.addFormItem(new FormItem(constants.cpuThreadsCluster(), cpuThreads, 1, 1, virtSupported) .withDefaultValue(constants.notAvailableLabel(), virtServiceNotSupported)); -- To view, visit http://gerrit.ovirt.org/20114 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7e1ada013b0ad470de9c959f9ae457f1d43fd51b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <fkob...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
