Daniel Erez has uploaded a new change for review. Change subject: userportal: OtherOS VM - NPE in basic view ......................................................................
userportal: OtherOS VM - NPE in basic view * Modified ApplicationResourcesWithLookup to correspond "OsType(Small/Large)Image" convention; I.e: ** s/other_LargeImage/otherLargeImage ** s/other_SmallImage/otherSmallImage * Modified OsTypeImage -> defaultImageName() accordingly. Change-Id: Id56e218a9895fa2fbaef48586272acfe80f9b382 Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationResourcesWithLookup.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/OsTypeImage.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmImageColumn.java 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/17648/1 diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationResourcesWithLookup.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationResourcesWithLookup.java index 35ca977..fd80e13 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationResourcesWithLookup.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationResourcesWithLookup.java @@ -7,7 +7,7 @@ // OS large types @Source("images/os/large/other.png") - ImageResource other_LargeImage(); + ImageResource otherLargeImage(); @Source("images/os/large/other_linux.png") ImageResource other_linuxLargeImage(); @@ -88,7 +88,7 @@ // TODO remove the same resources from ApplicationResources and rename this @Source("images/os/other.jpg") - ImageResource other_SmallImage(); + ImageResource otherSmallImage(); @Source("images/os/other_linux.jpg") ImageResource other_linuxSmallImage(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/OsTypeImage.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/OsTypeImage.java index 520369a..119c616 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/OsTypeImage.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/OsTypeImage.java @@ -27,7 +27,7 @@ @Override protected String defaultImageName(Integer value) { - return "OtherOs" + nameUniquePart + IMAGE; //$NON-NLS-1$ + return "other" + nameUniquePart + IMAGE; //$NON-NLS-1$ } } 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 954dc8d..c074299 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 @@ -25,7 +25,7 @@ ResourcePrototype resource = getApplicationResourcesWithLookup().getResource(osTypeName + "SmallImage"); //$NON-NLS-1$ if (resource == null || !(resource instanceof ImageResource)) { - resource = getApplicationResourcesWithLookup().other_SmallImage(); + resource = getApplicationResourcesWithLookup().otherSmallImage(); } return (ImageResource) resource; -- To view, visit http://gerrit.ovirt.org/17648 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id56e218a9895fa2fbaef48586272acfe80f9b382 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
