Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: deleted AbstractUserPortalImageResourceColumn ......................................................................
userportal, webadmin: deleted AbstractUserPortalImageResourceColumn Deleted a useless class, AbstractUserPortalImageResourceColumn, which simply provided resources to its one subclasses. No functional changes -- just a refactor. Change-Id: Ic190e89cd4d59ae76963ba12b2a077b35b5ad76b Signed-off-by: Greg Sheremeta <gsher...@redhat.com> --- D frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/AbstractUserPortalImageResourceColumn.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmImageColumn.java 2 files changed, 8 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/38728/1 diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/AbstractUserPortalImageResourceColumn.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/AbstractUserPortalImageResourceColumn.java deleted file mode 100644 index f480a77..0000000 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/AbstractUserPortalImageResourceColumn.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.ovirt.engine.ui.userportal.widget.table.column; - -import org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn; -import org.ovirt.engine.ui.userportal.ApplicationResourcesWithLookup; -import org.ovirt.engine.ui.userportal.gin.ClientGinjectorProvider; - -public abstract class AbstractUserPortalImageResourceColumn<T> extends AbstractImageResourceColumn<T> { - - protected ApplicationResourcesWithLookup getApplicationResourcesWithLookup() { - return ClientGinjectorProvider.getApplicationResourcesWithLookup(); - } - -} 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 d292c56..76cbb39 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 @@ -1,11 +1,16 @@ package org.ovirt.engine.ui.userportal.widget.table.column; +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 com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.resources.client.ResourcePrototype; -public class VmImageColumn<T> extends AbstractUserPortalImageResourceColumn<T> { +public class VmImageColumn<T> extends AbstractImageResourceColumn<T> { + + private final ApplicationResourcesWithLookup resourcesWithLookup = GWT.create(ApplicationResourcesWithLookup.class); public interface OsTypeExtractor<T> { int extractOsType(T item); @@ -21,10 +26,10 @@ @Override public ImageResource getValue(T item) { String osTypeName = AsyncDataProvider.getInstance().getOsUniqueOsNames().get(extractor.extractOsType(item)); - ResourcePrototype resource = getApplicationResourcesWithLookup().getResource(osTypeName + "SmallImage"); //$NON-NLS-1$ + ResourcePrototype resource = resourcesWithLookup.getResource(osTypeName + "SmallImage"); //$NON-NLS-1$ if (!(resource instanceof ImageResource)) { - resource = getApplicationResourcesWithLookup().otherSmallImage(); + resource = resourcesWithLookup.otherSmallImage(); } return (ImageResource) resource; -- To view, visit https://gerrit.ovirt.org/38728 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic190e89cd4d59ae76963ba12b2a077b35b5ad76b 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