Greg Sheremeta has uploaded a new change for review.
Change subject: userportal, webadmin: renamed StyledImageResourceCell ->
ImageResourceCell
......................................................................
userportal, webadmin: renamed StyledImageResourceCell -> ImageResourceCell
(Patch 4r of 12)
renamed StyledImageResourceCell -> ImageResourceCell
renamed column/ImageResourceCell -> ImageResourceCell2
No logic changes. Just a rename.
Change-Id: Iad66b635dd68204c79d1dc0e4fd1d81717769990
Signed-off-by: Greg Sheremeta <gsher...@redhat.com>
---
R
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageResourceCell.java
R
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageResourceCell2.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/LunSelectionCell.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractImageResourceColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn2.java
5 files changed, 17 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/38630/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/StyledImageResourceCell.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageResourceCell.java
similarity index 92%
rename from
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/StyledImageResourceCell.java
rename to
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageResourceCell.java
index 67ab13c..4bb8622a 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/StyledImageResourceCell.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageResourceCell.java
@@ -13,7 +13,7 @@
/**
* ImageResourceCell that supports setting a style and displaying a tooltip in
a DecoratedPopupPanel.
*/
-public class StyledImageResourceCell extends
AbstractTitlePanelCell<ImageResource> implements HasStyleClass {
+public class ImageResourceCell extends AbstractTitlePanelCell<ImageResource>
implements HasStyleClass {
interface CellTemplate extends SafeHtmlTemplates {
@Template("<div style=\"{0}\" class=\"{1}\">{2}</div>")
@@ -25,7 +25,7 @@
private static CellTemplate template;
- public StyledImageResourceCell() {
+ public ImageResourceCell() {
super();
// Delay cell template creation until the first time it's needed
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/ImageResourceCell.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageResourceCell2.java
similarity index 79%
rename from
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/ImageResourceCell.java
rename to
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageResourceCell2.java
index ae7498c..7529d18 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/ImageResourceCell.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageResourceCell2.java
@@ -1,7 +1,6 @@
-package org.ovirt.engine.ui.common.widget.table.column;
+package org.ovirt.engine.ui.common.widget.table.cell;
import org.ovirt.engine.ui.common.widget.table.HasStyleClass;
-import org.ovirt.engine.ui.common.widget.table.cell.AbstractTooltipCell;
import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
@@ -12,10 +11,10 @@
import com.google.gwt.user.client.ui.AbstractImagePrototype;
/**
- * Cell that renders and ImageResource. Supports setting a style / class.
Supports tooltips.
- * TODO: this will replace StyledImageResourceCell. Delete it and change
references.
+ * Cell that renders an ImageResource. Supports setting a style / class.
Supports tooltips.
+ * TODO: this will replace ImageResourceCell in a follow-up patch.
*/
-public class ImageResourceCell extends AbstractTooltipCell<ImageResource>
implements HasStyleClass {
+public class ImageResourceCell2 extends AbstractTooltipCell<ImageResource>
implements HasStyleClass {
interface CellTemplate extends SafeHtmlTemplates {
@Template("<div id=\"{0}\" style=\"{1}\" class=\"{2}\">{3}</div>")
@@ -27,7 +26,7 @@
private CellTemplate template;
- public ImageResourceCell() {
+ public ImageResourceCell2() {
super();
// Delay cell template creation until the first time it's needed
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/LunSelectionCell.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/LunSelectionCell.java
index 3e1214f..61daf1a 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/LunSelectionCell.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/LunSelectionCell.java
@@ -23,7 +23,7 @@
@Override
public void render(Context context, LunModel value, SafeHtmlBuilder sb) {
- StyledImageResourceCell imageCell = new StyledImageResourceCell();
+ ImageResourceCell imageCell = new ImageResourceCell();
imageCell.setStyle("text-align: center;"); //$NON-NLS-1$
if (value.getIsIncluded()) {
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractImageResourceColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractImageResourceColumn.java
index 59b42d0..3bbe9f1 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractImageResourceColumn.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractImageResourceColumn.java
@@ -3,7 +3,7 @@
import org.ovirt.engine.ui.common.CommonApplicationConstants;
import org.ovirt.engine.ui.common.CommonApplicationResources;
import org.ovirt.engine.ui.common.CommonApplicationTemplates;
-import org.ovirt.engine.ui.common.widget.table.cell.StyledImageResourceCell;
+import org.ovirt.engine.ui.common.widget.table.cell.ImageResourceCell;
import org.ovirt.engine.ui.uicompat.EnumTranslator;
import com.google.gwt.core.client.GWT;
@@ -12,7 +12,7 @@
import com.google.gwt.user.client.ui.AbstractImagePrototype;
/**
- * Column for rendering {@link ImageResource} instances using {@link
StyledImageResourceCell}.
+ * Column for rendering {@link ImageResource} instances using {@link
ImageResourceCell}.
*
* @param <T>
* Table row data type.
@@ -24,12 +24,12 @@
private static final CommonApplicationTemplates TEMPLATES =
GWT.create(CommonApplicationTemplates.class);
public AbstractImageResourceColumn() {
- super(new StyledImageResourceCell());
+ super(new ImageResourceCell());
}
@Override
- public StyledImageResourceCell getCell() {
- return (StyledImageResourceCell) super.getCell();
+ public ImageResourceCell getCell() {
+ return (ImageResourceCell) super.getCell();
}
public void setTitle(String title) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn2.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn2.java
index 50eeec6..8275d35 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn2.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn2.java
@@ -2,9 +2,9 @@
import org.ovirt.engine.core.common.businessentities.Commented;
import org.ovirt.engine.ui.common.CommonApplicationResources;
+import org.ovirt.engine.ui.common.widget.table.cell.ImageResourceCell2;
import org.ovirt.engine.ui.common.widget.table.cell.TooltipCell;
-import org.ovirt.engine.ui.common.widget.table.column.AbstractColumn;
-import org.ovirt.engine.ui.common.widget.table.column.ImageResourceCell;
+import org.ovirt.engine.ui.common.widget.table.column.AbstractTooltipColumn;
import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ImageResource;
@@ -17,12 +17,12 @@
*
* @param <T> row type
*/
-public class CommentColumn2<T extends Commented> extends AbstractColumn<T,
ImageResource> {
+public class CommentColumn2<T extends Commented> extends
AbstractTooltipColumn<T, ImageResource> {
private static final CommonApplicationResources RESOURCES =
GWT.create(CommonApplicationResources.class);
public CommentColumn2() {
- super(new ImageResourceCell());
+ super(new ImageResourceCell2());
}
public CommentColumn2(TooltipCell<ImageResource> cell) {
--
To view, visit https://gerrit.ovirt.org/38630
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad66b635dd68204c79d1dc0e4fd1d81717769990
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
