[Engine-patches] Change in ovirt-engine[master]: userportal, webadmin: moved ApplicationResourcesWithLookup

[gshereme]

Greg Sheremeta has uploaded a new change for review.

Change subject: userportal, webadmin: moved ApplicationResourcesWithLookup
......................................................................

userportal, webadmin: moved ApplicationResourcesWithLookup

moved ApplicationResourcesWithLookup from ClientGinjectorProvider
to AssetProvider.

Change-Id: I5ff5a0cef1fef2af5a4e6745639518c9e1eda32d
Signed-off-by: Greg Sheremeta <gsher...@redhat.com>
---
M 
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/AssetProvider.java
M 
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorProvider.java
M 
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmImageColumn.java
3 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/38996/1

diff --git 
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/AssetProvider.java
 
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/AssetProvider.java
index 19af63b..7758d1d 100644
--- 
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/AssetProvider.java
+++ 
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/AssetProvider.java
@@ -3,6 +3,7 @@
 import org.ovirt.engine.ui.userportal.ApplicationConstants;
 import org.ovirt.engine.ui.userportal.ApplicationMessages;
 import org.ovirt.engine.ui.userportal.ApplicationResources;
+import org.ovirt.engine.ui.userportal.ApplicationResourcesWithLookup;
 import org.ovirt.engine.ui.userportal.ApplicationTemplates;
 
 import com.google.inject.Inject;
@@ -41,4 +42,11 @@
         return applicationResourcesProvider;
     }
 
+    @Inject
+    static ApplicationResourcesWithLookup 
applicationResourcesWithLookupProvider;
+
+    public static ApplicationResourcesWithLookup getResourcesWithLookup() {
+        return applicationResourcesWithLookupProvider;
+    }
+
 }
diff --git 
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorProvider.java
 
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorProvider.java
index b570be5..107abce 100644
--- 
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorProvider.java
+++ 
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/gin/ClientGinjectorProvider.java
@@ -2,7 +2,6 @@
 
 import org.ovirt.engine.ui.common.system.ClientStorage;
 import org.ovirt.engine.ui.common.uicommon.ClientAgentType;
-import org.ovirt.engine.ui.userportal.ApplicationResourcesWithLookup;
 
 import com.google.gwt.event.shared.EventBus;
 import com.google.inject.Inject;
@@ -22,13 +21,6 @@
 
     public static EventBus getEventBus() {
         return eventBusProvider.get();
-    }
-
-    @Inject
-    static Provider<ApplicationResourcesWithLookup> 
applicationResourcesWithLookupProvider;
-
-    public static ApplicationResourcesWithLookup 
getApplicationResourcesWithLookup() {
-        return applicationResourcesWithLookupProvider.get();
     }
 
     @Inject
diff --git 
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmImageColumn.java
 
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmImageColumn.java
index c228d27..e48d1f3 100644
--- 
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmImageColumn.java
+++ 
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmImageColumn.java
@@ -3,14 +3,14 @@
 import 
org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn;
 import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider;
 import org.ovirt.engine.ui.userportal.ApplicationResourcesWithLookup;
-import org.ovirt.engine.ui.userportal.gin.ClientGinjectorProvider;
+import org.ovirt.engine.ui.userportal.gin.AssetProvider;
 
 import com.google.gwt.resources.client.ImageResource;
 import com.google.gwt.resources.client.ResourcePrototype;
 
 public class VmImageColumn<T> extends AbstractImageResourceColumn<T> {
 
-    private final ApplicationResourcesWithLookup resourcesWithLookup = 
ClientGinjectorProvider.getApplicationResourcesWithLookup();
+    private final static ApplicationResourcesWithLookup resourcesWithLookup = 
AssetProvider.getResourcesWithLookup();
 
     public interface OsTypeExtractor<T> {
         int extractOsType(T item);


-- 
To view, visit https://gerrit.ovirt.org/38996
To unsubscribe, visit https://gerrit.ovirt.org/settings

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