Tomas Jelinek has uploaded a new change for review.

Change subject: userportal,webadmin: update the isWindowsOs detection
......................................................................

userportal,webadmin: update the isWindowsOs detection

The patch fb1788d633687f634d56fdbca659623e026cfff6 have added the
support for windows 8/2012 and also updated the DataProvider.GetWindowsOsTypes

The patch 0c66da61a5d4d57299525737063bb57561134f5d have deleted the
DataProvider, but the same logic was not moved to AsyncDataProvider.

This patch changes the AsyncDataProvider.GetWindowsOsTypes to look
the same as the DataProvider.GetWindowsOsTypes so includes all the
windows OS types

Change-Id: Iacdf88ca2ec50416eac7913a5bcf214e29b7e575
Signed-off-by: Tomas Jelinek <[email protected]>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
1 file changed, 6 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/10210/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
index 897a161..42b64c5 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
@@ -2741,17 +2741,12 @@
         }
 
         /***** TODO: remove once the gwt is using generic api instead of 
backend! *****/
-        windowsOsTypes =
-            new ArrayList<VmOsType>(Arrays.asList(new VmOsType[] {
-                VmOsType.Windows2003,
-                VmOsType.Windows2003x64,
-                VmOsType.Windows2008,
-                VmOsType.Windows2008R2x64,
-                VmOsType.Windows2008x64,
-                VmOsType.Windows7,
-                VmOsType.Windows7x64,
-                VmOsType.WindowsXP
-            }));
+        windowsOsTypes = new ArrayList<VmOsType>();
+        for (VmOsType type : VmOsType.values()) {
+            if (type.isWindows()) {
+                windowsOsTypes.add(type);
+            }
+        }
 
         return windowsOsTypes;
         
/*******************************************************************************/


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacdf88ca2ec50416eac7913a5bcf214e29b7e575
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to