[Engine-patches] Change in ovirt-engine[master]: webadmin: Use ConfigCommon version in AsyncDataProvider

[awels]

Alexander Wels has uploaded a new change for review.

Change subject: webadmin: Use ConfigCommon version in AsyncDataProvider
......................................................................

webadmin: Use ConfigCommon version in AsyncDataProvider

- Cleaned up code to use the configuration version from
ConfigCommon insteand of querying for it.

Change-Id: I4c9213aee9182d3bb27fbba04f7163b502438a3e
Signed-off-by: Alexander Wels <aw...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
1 file changed, 2 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/11174/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 1b0e739..30f9a20 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
@@ -50,6 +50,7 @@
 import 
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
 import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType;
 import 
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
+import org.ovirt.engine.core.common.config.ConfigCommon;
 import org.ovirt.engine.core.common.interfaces.SearchType;
 import org.ovirt.engine.core.common.mode.ApplicationMode;
 import org.ovirt.engine.core.common.queries.CommandVersionsInfo;
@@ -129,8 +130,6 @@
 
 public final class AsyncDataProvider {
 
-    private static final String GENERAL = "general"; //$NON-NLS-1$
-
     // dictionary to hold cache of all config values (per version) queried by 
client, if the request for them succeeded.
     private static HashMap<KeyValuePairCompat<ConfigurationValues, String>, 
Object> cachedConfigValues =
             new HashMap<KeyValuePairCompat<ConfigurationValues, String>, 
Object>();
@@ -138,9 +137,8 @@
     private static HashMap<KeyValuePairCompat<ConfigurationValues, String>, 
Object> cachedConfigValuesPreConvert =
             new HashMap<KeyValuePairCompat<ConfigurationValues, String>, 
Object>();
 
-    private static String _defaultConfigurationVersion = null;
     public static String getDefaultConfigurationVersion() {
-        return _defaultConfigurationVersion;
+        return ConfigCommon.defaultConfigurationVersion;
     }
 
     private static void getDefaultConfigurationVersion(Object target) {
@@ -148,12 +146,6 @@
 
             @Override
             public void OnSuccess(Object model, Object returnValue) {
-                if (returnValue != null) {
-                    _defaultConfigurationVersion =
-                            (String) ((VdcQueryReturnValue) 
returnValue).getReturnValue();
-                } else {
-                    _defaultConfigurationVersion = GENERAL;
-                }
                 LoginModel loginModel = (LoginModel) model;
                 loginModel.getLoggedInEvent().raise(loginModel, 
EventArgs.Empty);
             }


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

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