[Engine-patches] Change in ovirt-engine[master]: webadmin: Make all disk size setting in DiskModel type safe

[tnisan]

Tal Nisan has uploaded a new change for review.

Change subject: webadmin: Make all disk size setting in DiskModel type safe
......................................................................

webadmin: Make all disk size setting in DiskModel type safe

Since the size entity in DiskModel is defined as an Integer entity model,
all the places that set the new entity should be in Integer type to ensure
type safety

Change-Id: I2f22ca6865fc7927eb9777986b1844e3b8639141
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
3 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/32195/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java
index d2545dc..d68b782 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java
@@ -811,7 +811,7 @@
 
         if (disk.getDiskStorageType() == DiskStorageType.IMAGE) {
             DiskImage diskImage = (DiskImage) disk;
-            EntityModel sizeEntity = new EntityModel();
+            EntityModel<Integer> sizeEntity = new EntityModel<Integer>();
             sizeEntity.setEntity((int) diskImage.getSizeInGigabytes());
             diskModel.setSize(sizeEntity);
             ListModel volumeList = new ListModel();
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java
index 09093cb..cd898c2 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java
@@ -247,7 +247,7 @@
 
             if (disk.getDiskStorageType() == DiskStorageType.IMAGE) {
                 DiskImage diskImage = (DiskImage) disk;
-                EntityModel size = new EntityModel();
+                EntityModel<Integer> size = new EntityModel<Integer>();
                 size.setEntity((int) diskImage.getSizeInGigabytes());
                 diskModel.setSize(size);
                 ListModel volumes = new ListModel();
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
index d3bfdeb..ae0bf28 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
@@ -550,9 +550,9 @@
                             if (disk.getDiskStorageType() == 
DiskStorageType.IMAGE) {
                                 DiskImage diskImage = (DiskImage) disk;
 
-                                EntityModel tempVar = new EntityModel();
-                                tempVar.setEntity((int) 
diskImage.getSizeInGigabytes());
-                                diskModel.setSize(tempVar);
+                                EntityModel<Integer> sizeEntity = new 
EntityModel<Integer>();
+                                sizeEntity.setEntity((int) 
diskImage.getSizeInGigabytes());
+                                diskModel.setSize(sizeEntity);
                                 ListModel tempVar2 = new ListModel();
                                 tempVar2.setItems((diskImage.getVolumeType() 
== VolumeType.Preallocated ? new ArrayList<VolumeType>(Arrays.asList(new 
VolumeType[] {VolumeType.Preallocated}))
                                         : 
AsyncDataProvider.getInstance().getVolumeTypeList()));


-- 
To view, visit http://gerrit.ovirt.org/32195
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f22ca6865fc7927eb9777986b1844e3b8639141
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tni...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches