Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: DataProvider.java cleanup (3/6) ......................................................................
webadmin: DataProvider.java cleanup (3/6) DataProvider is a class which is mostly obsolete, as it contains synchronous calls to the engine, which are not relevant anymore under the GWT platform/infrastructure. The goal is to eliminate this class all-together. In this patch: Removing IsLicenseHasDesktops, and reference, since it always returns true. Change-Id: I25ce87c5107a483dfbe2ad2d3625a9dfaadf3064 Signed-off-by: Gilad Chaplik <[email protected]> Bug-Url: https://bugzilla.redhat.com/881747 --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java 2 files changed, 2 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/19/9719/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java index ac23b04..330dff3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/DataProvider.java @@ -39,13 +39,6 @@ return null; } - public static boolean IsLicenseHasDesktops() - { - // var dict = GetLicenseProperties(); - // return dict.ContainsKey("ProductTypeProperty") && dict["ProductTypeProperty"].Contains("Desktop"); - return true; - } - public static boolean IsVmNameUnique(String name) { VdcQueryReturnValue returnValue = diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java index 5a89fac..e93b5d7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java @@ -21,7 +21,6 @@ import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; -import org.ovirt.engine.ui.uicommonweb.DataProvider; import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.ReportInit; import org.ovirt.engine.ui.uicommonweb.UICommand; @@ -806,13 +805,8 @@ list.add(storageList); vmList = new VmListModel(); list.add(vmList); - - if (DataProvider.IsLicenseHasDesktops()) - { - poolList = new PoolListModel(); - list.add(poolList); - } - + poolList = new PoolListModel(); + list.add(poolList); templateList = new TemplateListModel(); list.add(templateList); eventList = new EventListModel(); -- To view, visit http://gerrit.ovirt.org/9719 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25ce87c5107a483dfbe2ad2d3625a9dfaadf3064 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
