ofri masad has uploaded a new change for review.
Change subject: webadmin: Cleanup quota popup view (#847950)
......................................................................
webadmin: Cleanup quota popup view (#847950)
Cleanup, number format fix and constants added.
Change-Id: Ib27be9b4cec1bf515a6759e38ad1f9349be5b771
Signed-off-by: Ofri Masad <oma...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/QuotaStorage.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/QuotaVdsGroup.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java
3 files changed, 20 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/7382/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/QuotaStorage.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/QuotaStorage.java
index 7af93f9..d668aac 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/QuotaStorage.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/QuotaStorage.java
@@ -13,6 +13,7 @@
@SuppressWarnings("unused")
public class QuotaStorage extends IVdcQueryable implements
INotifyPropertyChanged, Serializable {
+ public static final Long UNLIMITED = -1L;
/**
* Automatic generated serial version ID.
*/
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/QuotaVdsGroup.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/QuotaVdsGroup.java
index 834132d..eeeac93 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/QuotaVdsGroup.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/QuotaVdsGroup.java
@@ -12,6 +12,9 @@
*/
public class QuotaVdsGroup extends IVdcQueryable implements
INotifyPropertyChanged, Serializable {
+ public static final Long UNLIMITED_MEM = -1L;
+ public static final Integer UNLIMITED_VCPU = -1;
+
/**
* Automatic generated serial version ID.
*/
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java
index 6096fce..bbbf92e 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java
@@ -20,6 +20,7 @@
import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor;
import org.ovirt.engine.ui.common.widget.form.Slider;
import org.ovirt.engine.ui.common.widget.form.Slider.SliderValueChange;
+import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer;
import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer;
import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip;
import org.ovirt.engine.ui.uicommonweb.models.ListModel;
@@ -55,6 +56,9 @@
private static final String MAX_COLOR = "#4E9FDD"; //$NON-NLS-1$
private static final String MIN_COLOR = "#AFBF27"; //$NON-NLS-1$
+
+ private static final DiskSizeRenderer<Number> diskSizeRenderer =
+ new
DiskSizeRenderer<Number>(DiskSizeRenderer.DiskSizeUnit.GIGABYTE);
@UiField
WidgetStyle style;
@@ -223,7 +227,7 @@
public void update(int index, QuotaStorage object, Boolean value) {
if (value) {
selectedStorageGuid.add(object.getStorageId());
- object.setStorageSizeGB((long) -1);
+ object.setStorageSizeGB(QuotaStorage.UNLIMITED);
} else {
selectedStorageGuid.remove(object.getStorageId());
object.setStorageSizeGB(null);
@@ -249,15 +253,16 @@
quotaStorageTable.addColumn(new TextColumnWithTooltip<QuotaStorage>() {
@Override
public String getValue(QuotaStorage object) {
- String str = ""; //$NON-NLS-1$
+ String str; //$NON-NLS-1$
if (object.getStorageSizeGB() == null) {
return ""; //$NON-NLS-1$
- } else if (object.getStorageSizeGB() == -1) {
+ } else if
(object.getStorageSizeGB().equals(QuotaStorage.UNLIMITED)) {
str = constants.outOfQuota() + constants.unlimitedQuota();
} else {
- str = constants.outOfQuota() + object.getStorageSizeGB();
+ str = constants.outOfQuota() +
diskSizeRenderer.render(object.getStorageSizeGB());
}
- return object.getStorageSizeGBUsage() + str + " GB";
//$NON-NLS-1$
+ return (object.getStorageSizeGBUsage() == 0 ? 0
+ :
diskSizeRenderer.render(object.getStorageSizeGBUsage())) + str;
}
}, constants.quota());
@@ -306,8 +311,8 @@
public void update(int index, QuotaVdsGroup object, Boolean value)
{
if (value) {
selectedClusterGuid.add(object.getVdsGroupId());
- object.setVirtualCpu(-1);
- object.setMemSizeMB((long) -1);
+ object.setVirtualCpu(QuotaVdsGroup.UNLIMITED_VCPU);
+ object.setMemSizeMB(QuotaVdsGroup.UNLIMITED_MEM);
} else {
selectedClusterGuid.remove(object.getVdsGroupId());
object.setVirtualCpu(null);
@@ -334,10 +339,10 @@
quotaClusterTable.addColumn(new TextColumnWithTooltip<QuotaVdsGroup>()
{
@Override
public String getValue(QuotaVdsGroup object) {
- String str = ""; //$NON-NLS-1$
+ String str; //$NON-NLS-1$
if (object.getMemSizeMB() == null) {
return ""; //$NON-NLS-1$
- } else if (object.getMemSizeMB() == -1) {
+ } else if
(object.getMemSizeMB().equals(QuotaVdsGroup.UNLIMITED_MEM)) {
str = constants.outOfQuota() + constants.unlimitedQuota();
} else {
str = constants.outOfQuota() + object.getMemSizeMB();
@@ -349,10 +354,10 @@
quotaClusterTable.addColumn(new TextColumnWithTooltip<QuotaVdsGroup>()
{
@Override
public String getValue(QuotaVdsGroup object) {
- String str = ""; //$NON-NLS-1$
+ String str; //$NON-NLS-1$
if (object.getVirtualCpu() == null) {
return ""; //$NON-NLS-1$
- } else if (object.getVirtualCpu() == -1) {
+ } else if
(object.getVirtualCpu().equals(QuotaVdsGroup.UNLIMITED_VCPU)) {
str = constants.outOfQuota() + constants.unlimitedQuota();
} else {
str = constants.outOfQuota() + object.getVirtualCpu();
--
To view, visit http://gerrit.ovirt.org/7382
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib27be9b4cec1bf515a6759e38ad1f9349be5b771
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: ofri masad <oma...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
