Greg Sheremeta has uploaded a new change for review.
Change subject: userportal, webadmin: removed stray DecoratedImageResouceCell
......................................................................
userportal, webadmin: removed stray DecoratedImageResouceCell
(Patch 4q of 12)
No logic changes. Just a rename / replace.
Change-Id: Ib62dd35b22e8e8ded050ca56fd7688306548fcf4
Signed-off-by: Greg Sheremeta <gsher...@redhat.com>
---
D
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/DecoratedImageResouceCell.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractDecoratedImageColumn.java
2 files changed, 4 insertions(+), 48 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/38629/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/DecoratedImageResouceCell.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/DecoratedImageResouceCell.java
deleted file mode 100644
index eabdd02..0000000
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/DecoratedImageResouceCell.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.ovirt.engine.ui.common.widget.table.cell;
-
-import org.ovirt.engine.ui.common.widget.ImageWithDecorator;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.safehtml.client.SafeHtmlTemplates;
-import com.google.gwt.safehtml.shared.SafeHtml;
-import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
-import com.google.gwt.safehtml.shared.SafeHtmlUtils;
-import com.google.gwt.user.client.ui.AbstractImagePrototype;
-
-public class DecoratedImageResouceCell extends
AbstractTitlePanelCell<ImageWithDecorator> {
-
- interface CellTemplate extends SafeHtmlTemplates {
- @Template("<div style=\"position: relative; left: 0; top: 0;\"><span
style=\"position: relative; left: 0px; top: 0px;\">{0}</span><span
style=\"position: absolute; left: {2}px; top: {3}px;\">{1}</span></div>")
- SafeHtml doubleImageContainer(SafeHtml imageHtml, SafeHtml
decoratorHtml, int left, int top);
- }
-
- private static final CellTemplate template =
GWT.create(CellTemplate.class);
-
- public DecoratedImageResouceCell() {
- super();
- }
-
- @Override
- public void render(Context context, ImageWithDecorator value,
SafeHtmlBuilder sb) {
- if (value != null) {
- SafeHtml mainImageHtml = SafeHtmlUtils.fromTrustedString("");
- SafeHtml decorateImageHtml = SafeHtmlUtils.fromTrustedString("");
- if (value.getImage() != null) {
- mainImageHtml =
-
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(value.getImage()).getHTML());
- }
- if (value.getDecorator() != null) {
- decorateImageHtml =
-
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(value.getDecorator()).getHTML());
- }
- sb.append(template.doubleImageContainer(mainImageHtml,
- decorateImageHtml,
- value.getDecoratorPositionLeft(),
- value.getDecoratorPositionTop()));
- }
- }
-}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractDecoratedImageColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractDecoratedImageColumn.java
index 12515d0..8c5b69a 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractDecoratedImageColumn.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractDecoratedImageColumn.java
@@ -1,7 +1,7 @@
package org.ovirt.engine.ui.common.widget.table.column;
import org.ovirt.engine.ui.common.widget.ImageWithDecorator;
-import org.ovirt.engine.ui.common.widget.table.cell.DecoratedImageResouceCell;
+import org.ovirt.engine.ui.common.widget.table.cell.DecoratedImageResourceCell;
import org.ovirt.engine.ui.uicompat.EnumTranslator;
import com.google.gwt.user.cellview.client.Column;
@@ -9,12 +9,12 @@
public abstract class AbstractDecoratedImageColumn<T> extends Column<T,
ImageWithDecorator> {
public AbstractDecoratedImageColumn() {
- super(new DecoratedImageResouceCell());
+ super(new DecoratedImageResourceCell());
}
@Override
- public DecoratedImageResouceCell getCell() {
- return (DecoratedImageResouceCell) super.getCell();
+ public DecoratedImageResourceCell getCell() {
+ return (DecoratedImageResourceCell) super.getCell();
}
public void setTitle(String title) {
--
To view, visit https://gerrit.ovirt.org/38629
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib62dd35b22e8e8ded050ca56fd7688306548fcf4
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
