Greg Sheremeta has uploaded a new change for review.
Change subject: userportal, webadmin: Sortable Column refactor
......................................................................
userportal, webadmin: Sortable Column refactor
(Patch 4y of 12)
Moved AbstractSortableColumn's sorting functionality into AbstractColumn.
Since AbstractColumn also supports the Element ID framework,
AbstractSortableColumnWithElementId was obsoleted. Thus both
AbstractSortableColumn and AbstractSortableColumnWithElementId were deleted.
All occurrences replaced with AbstractColumn.
Created an interface called SortableColumn and used that for the
instanceof check in AbstractActionTable.
No functional changes -- refactor only.
Change-Id: I7d26f817b3e79e996590873fef782fac14967fd1
Signed-off-by: Greg Sheremeta <gsher...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCheckboxColumn.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractColumn.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractImageResourceColumn.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSafeHtmlColumn.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSafeHtmlWithSafeHtmlTooltipColumn.java
D
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSortableColumn.java
D
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSortableColumnWithElementId.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractTextColumn.java
A
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SortableColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterVolumeSnapshotStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDeviceStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusColumn.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeStatusColumn.java
18 files changed, 131 insertions(+), 133 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/38702/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java
index 60e7fc2..ad58fa3 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java
@@ -11,7 +11,7 @@
import org.ovirt.engine.ui.common.uicommon.model.SearchableTableModelProvider;
import org.ovirt.engine.ui.common.widget.action.AbstractActionPanel;
import org.ovirt.engine.ui.common.widget.label.NoItemsLabel;
-import org.ovirt.engine.ui.common.widget.table.column.AbstractSortableColumn;
+import org.ovirt.engine.ui.common.widget.table.column.SortableColumn;
import org.ovirt.engine.ui.uicommonweb.UICommand;
import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel;
import org.ovirt.engine.ui.uicompat.IEventListener;
@@ -470,14 +470,14 @@
SearchableListModel<?, ?> model = getDataProvider().getModel();
Column<?, ?> column = event.getColumn();
- if (column instanceof AbstractSortableColumn) {
- AbstractSortableColumn<T, ?> sortedColumn =
(AbstractSortableColumn<T, ?>) column;
+ if (column instanceof SortableColumn) {
+ SortableColumn<T, ?> sortableColumn = (SortableColumn<T,
?>) column;
boolean sortApplied = false;
// Apply server-side sorting, if supported by the model
if (model.supportsServerSideSorting()) {
if (model.isSearchValidForServerSideSorting()) {
- model.updateSortOptions(sortedColumn.getSortBy(),
event.isSortAscending());
+
model.updateSortOptions(sortableColumn.getSortBy(), event.isSortAscending());
sortApplied = true;
} else {
model.clearSortOptions();
@@ -486,7 +486,7 @@
// Otherwise, fall back to client-side sorting
else {
- Comparator<? super T> comparator =
sortedColumn.getComparator();
+ Comparator<? super T> comparator =
sortableColumn.getComparator();
if (comparator != null) {
((SearchableListModel<?, T>)
model).setComparator(comparator, event.isSortAscending());
sortApplied = true;
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCheckboxColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCheckboxColumn.java
index 9b6c160..b2aa6d4 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCheckboxColumn.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractCheckboxColumn.java
@@ -14,7 +14,7 @@
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
import com.google.gwt.view.client.CellPreviewEvent;
-public abstract class AbstractCheckboxColumn<T> extends
AbstractSortableColumn<T, Boolean> {
+public abstract class AbstractCheckboxColumn<T> extends AbstractColumn<T,
Boolean> {
private boolean centered = false;
private boolean multipleSelectionAllowed = true;
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractColumn.java
index 8a7aab8..05483a1 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractColumn.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractColumn.java
@@ -1,13 +1,25 @@
package org.ovirt.engine.ui.common.widget.table.column;
+import java.util.Comparator;
+
import org.ovirt.engine.ui.common.idhandler.CellWithElementId;
import com.google.gwt.user.cellview.client.Column;
/**
* Base class for Columns that work with Cells that use the Element ID
framework.
+ * Supports sorting (setting options for server-side and client-side sorting).
+ * Supports element-id framework.
*/
-public abstract class AbstractColumn<T, C> extends Column<T, C> implements
ColumnWithElementId {
+public abstract class AbstractColumn<T, C> extends Column<T, C> implements
ColumnWithElementId, SortableColumn<T, C> {
+
+ // Name of the field to sort by, or null for undefined sort order
+ // (applies in case of server-side sorting)
+ private String sortBy;
+
+ // Comparator for sorting table row data objects, or null for undefined
sorting
+ // (applies in case of client-side sorting)
+ private Comparator<? super T> comparator;
public AbstractColumn(CellWithElementId<C> cell) {
super(cell);
@@ -23,4 +35,52 @@
getCell().setColumnId(columnId);
}
+ /**
+ * Enables <em>server-side</em> sorting for this column.
+ *
+ * @param sortBy
+ * Name of the field to sort by, used within the search query.
+ */
+ @Override
+ public void makeSortable(String sortBy) {
+ assert sortBy != null : "sortBy cannot be null"; //$NON-NLS-1$
+ this.sortBy = sortBy;
+ this.comparator = null;
+ setSortable(true);
+ }
+
+ /**
+ * Enables <em>client-side</em> sorting for this column.
+ *
+ * @param comparator
+ * Comparator for sorting table row data objects.
+ */
+ @Override
+ public void makeSortable(Comparator<? super T> comparator) {
+ assert comparator != null : "comparator cannot be null"; //$NON-NLS-1$
+ this.sortBy = null;
+ this.comparator = comparator;
+ setSortable(true);
+ }
+
+ /**
+ * Returns the name of the field to sort by, or {@code null} for undefined
sort order.
+ * <p>
+ * Use this method if server-side sorting is supported by the underlying
model.
+ */
+ @Override
+ public String getSortBy() {
+ return sortBy;
+ }
+
+ /**
+ * Returns the {@link Comparator} for sorting table row data objects, or
{@code null} for undefined sorting.
+ * <p>
+ * Use this method if server-side sorting is <em>not</em> supported by the
underlying model.
+ */
+ @Override
+ public Comparator<? super T> getComparator() {
+ return comparator;
+ }
+
}
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 3bbe9f1..8c1ed2b 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
@@ -17,7 +17,7 @@
* @param <T>
* Table row data type.
*/
-public abstract class AbstractImageResourceColumn<T> extends
AbstractSortableColumn<T, ImageResource> {
+public abstract class AbstractImageResourceColumn<T> extends AbstractColumn<T,
ImageResource> {
private static final CommonApplicationResources RESOURCES =
GWT.create(CommonApplicationResources.class);
protected static final CommonApplicationConstants CONSTANTS =
GWT.create(CommonApplicationConstants.class);
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSafeHtmlColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSafeHtmlColumn.java
index 6b93b45..7ba8cbc 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSafeHtmlColumn.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSafeHtmlColumn.java
@@ -10,7 +10,7 @@
* @param <T>
* Table row data type.
*/
-public abstract class AbstractSafeHtmlColumn<T> extends
AbstractSortableColumn<T, SafeHtml> {
+public abstract class AbstractSafeHtmlColumn<T> extends AbstractColumn<T,
SafeHtml> {
public AbstractSafeHtmlColumn() {
super(new SafeHtmlCell());
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSafeHtmlWithSafeHtmlTooltipColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSafeHtmlWithSafeHtmlTooltipColumn.java
index 2cb25d3..51b0789 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSafeHtmlWithSafeHtmlTooltipColumn.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSafeHtmlWithSafeHtmlTooltipColumn.java
@@ -13,7 +13,7 @@
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Widget;
-public abstract class AbstractSafeHtmlWithSafeHtmlTooltipColumn<T> extends
AbstractSortableColumn<T, SafeHtml>{
+public abstract class AbstractSafeHtmlWithSafeHtmlTooltipColumn<T> extends
AbstractColumn<T, SafeHtml>{
public AbstractSafeHtmlWithSafeHtmlTooltipColumn() {
super(new AbstractCell<SafeHtml>(BrowserEvents.MOUSEOVER,
BrowserEvents.MOUSEOUT) {
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSortableColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSortableColumn.java
deleted file mode 100644
index 01af52d..0000000
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSortableColumn.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.ovirt.engine.ui.common.widget.table.column;
-
-import java.util.Comparator;
-
-import org.ovirt.engine.ui.common.idhandler.CellWithElementId;
-
-import com.google.gwt.user.cellview.client.Column;
-
-/**
- * A {@link Column} that allows setting options for server-side and
client-side sorting.
- *
- * @param <T>
- * Table row data type.
- * @param <C>
- * Cell data type.
- */
-public abstract class AbstractSortableColumn<T, C> extends Column<T, C> {
-
- // Name of the field to sort by, or null for undefined sort order
- // (applies in case of server-side sorting)
- private String sortBy;
-
- // Comparator for sorting table row data objects, or null for undefined
sorting
- // (applies in case of client-side sorting)
- private Comparator<? super T> comparator;
-
- public AbstractSortableColumn(CellWithElementId<C> cell) {
- super(cell);
- }
-
- /**
- * Enables <em>server-side</em> sorting for this column.
- *
- * @param sortBy
- * Name of the field to sort by, used within the search query.
- */
- public void makeSortable(String sortBy) {
- assert sortBy != null : "sortBy cannot be null"; //$NON-NLS-1$
- this.sortBy = sortBy;
- this.comparator = null;
- setSortable(true);
- }
-
- /**
- * Enables <em>client-side</em> sorting for this column.
- *
- * @param comparator
- * Comparator for sorting table row data objects.
- */
- public void makeSortable(Comparator<? super T> comparator) {
- assert comparator != null : "comparator cannot be null"; //$NON-NLS-1$
- this.sortBy = null;
- this.comparator = comparator;
- setSortable(true);
- }
-
- /**
- * Returns the name of the field to sort by, or {@code null} for undefined
sort order.
- * <p>
- * Use this method if server-side sorting is supported by the underlying
model.
- */
- public String getSortBy() {
- return sortBy;
- }
-
- /**
- * Returns the {@link Comparator} for sorting table row data objects, or
{@code null} for undefined sorting.
- * <p>
- * Use this method if server-side sorting is <em>not</em> supported by the
underlying model.
- */
- public Comparator<? super T> getComparator() {
- return comparator;
- }
-
-}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSortableColumnWithElementId.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSortableColumnWithElementId.java
deleted file mode 100644
index 9e7ba53..0000000
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractSortableColumnWithElementId.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.ovirt.engine.ui.common.widget.table.column;
-
-import org.ovirt.engine.ui.common.idhandler.CellWithElementId;
-
-/**
- * A {@link AbstractSortableColumn} that implements ColumnWithElementId (has
an id).
- *
- * @param <T>
- * Table row data type.
- * @param <C>
- * Cell data type.
- */
-public abstract class AbstractSortableColumnWithElementId<T, C> extends
AbstractSortableColumn<T, C> implements ColumnWithElementId {
-
- public AbstractSortableColumnWithElementId(CellWithElementId<C> cell) {
- super(cell);
- }
-
- @Override
- public CellWithElementId<C> getCell() {
- return (CellWithElementId<C>) super.getCell();
- }
-
- @Override
- public void configureElementId(String elementIdPrefix, String columnId) {
- getCell().setElementIdPrefix(elementIdPrefix);
- getCell().setColumnId(columnId);
- }
-
-}
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractTextColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractTextColumn.java
index 5f28ece..1bf46bc 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractTextColumn.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractTextColumn.java
@@ -12,7 +12,7 @@
* @param <T>
* Table row data type.
*/
-public abstract class AbstractTextColumn<T> extends AbstractSortableColumn<T,
String> implements ColumnWithElementId {
+public abstract class AbstractTextColumn<T> extends AbstractColumn<T, String>
implements ColumnWithElementId {
public AbstractTextColumn() {
this(TextCell.UNLIMITED_LENGTH);
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SortableColumn.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SortableColumn.java
new file mode 100644
index 0000000..c2ded81
--- /dev/null
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/SortableColumn.java
@@ -0,0 +1,43 @@
+package org.ovirt.engine.ui.common.widget.table.column;
+
+import java.util.Comparator;
+
+/**
+ * A {@link Column} that allows setting options for server-side and
client-side sorting.
+ *
+ * @param <T> row type
+ * @param <C> cell type
+ */
+public interface SortableColumn<T, C> {
+
+ /**
+ * Enables <em>server-side</em> sorting for this column.
+ *
+ * @param sortBy
+ * Name of the field to sort by, used within the search query.
+ */
+ public abstract void makeSortable(String sortBy);
+
+ /**
+ * Enables <em>client-side</em> sorting for this column.
+ *
+ * @param comparator
+ * Comparator for sorting table row data objects.
+ */
+ public abstract void makeSortable(Comparator<? super T> comparator);
+
+ /**
+ * Returns the name of the field to sort by, or {@code null} for undefined
sort order.
+ * <p>
+ * Use this method if server-side sorting is supported by the underlying
model.
+ */
+ public abstract String getSortBy();
+
+ /**
+ * Returns the {@link Comparator} for sorting table row data objects, or
{@code null} for undefined sorting.
+ * <p>
+ * Use this method if server-side sorting is <em>not</em> supported by the
underlying model.
+ */
+ public abstract Comparator<? super T> getComparator();
+
+}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java
index 9d7a15f..16b2636 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java
@@ -18,7 +18,7 @@
import org.ovirt.engine.ui.common.widget.table.SimpleActionTable;
import
org.ovirt.engine.ui.common.widget.table.cell.StatusCompositeCellWithElementId;
import org.ovirt.engine.ui.common.widget.table.column.AbstractEnumColumn;
-import
org.ovirt.engine.ui.common.widget.table.column.AbstractSortableColumnWithElementId;
+import org.ovirt.engine.ui.common.widget.table.column.AbstractColumn;
import org.ovirt.engine.ui.common.widget.table.column.AbstractTextColumn;
import org.ovirt.engine.ui.frontend.AsyncQuery;
import org.ovirt.engine.ui.frontend.INewAsyncCallback;
@@ -165,8 +165,8 @@
statusColumn,
reasonColumn)));
- AbstractSortableColumnWithElementId<VDS, VDS> statusTextColumn =
- new AbstractSortableColumnWithElementId<VDS,
VDS>(compositeCell) {
+ AbstractColumn<VDS, VDS> statusTextColumn =
+ new AbstractColumn<VDS, VDS>(compositeCell) {
@Override
public VDS getValue(VDS object) {
return object;
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
index 10e3844..4574048 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java
@@ -18,7 +18,7 @@
import org.ovirt.engine.ui.common.widget.action.CommandLocation;
import
org.ovirt.engine.ui.common.widget.table.cell.StatusCompositeCellWithElementId;
import org.ovirt.engine.ui.common.widget.table.column.AbstractEnumColumn;
-import
org.ovirt.engine.ui.common.widget.table.column.AbstractSortableColumnWithElementId;
+import org.ovirt.engine.ui.common.widget.table.column.AbstractColumn;
import org.ovirt.engine.ui.common.widget.table.column.AbstractTextColumn;
import org.ovirt.engine.ui.uicommonweb.ReportInit;
import org.ovirt.engine.ui.uicommonweb.UICommand;
@@ -214,7 +214,7 @@
statusColumn,
reasonColumn)));
- AbstractSortableColumnWithElementId<VM, VM> statusTextColumn = new
AbstractSortableColumnWithElementId<VM, VM>(compositeCell) {
+ AbstractColumn<VM, VM> statusTextColumn = new AbstractColumn<VM,
VM>(compositeCell) {
@Override
public VM getValue(VM object) {
return object;
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickStatusColumn.java
index 36ee207..d90e0be 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickStatusColumn.java
@@ -3,10 +3,10 @@
import java.util.Comparator;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterBrickEntity;
-import org.ovirt.engine.ui.common.widget.table.column.AbstractSortableColumn;
+import org.ovirt.engine.ui.common.widget.table.column.AbstractColumn;
import org.ovirt.engine.ui.webadmin.widget.table.cell.BrickStatusCell;
-public class BrickStatusColumn extends
AbstractSortableColumn<GlusterBrickEntity, GlusterBrickEntity> {
+public class BrickStatusColumn extends AbstractColumn<GlusterBrickEntity,
GlusterBrickEntity> {
public BrickStatusColumn() {
super(new BrickStatusCell());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterVolumeSnapshotStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterVolumeSnapshotStatusColumn.java
index de29f38..27cde959 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterVolumeSnapshotStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterVolumeSnapshotStatusColumn.java
@@ -3,9 +3,9 @@
import java.util.Comparator;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeSnapshotEntity;
-import org.ovirt.engine.ui.common.widget.table.column.AbstractSortableColumn;
+import org.ovirt.engine.ui.common.widget.table.column.AbstractColumn;
-public class GlusterVolumeSnapshotStatusColumn extends
AbstractSortableColumn<GlusterVolumeSnapshotEntity,
GlusterVolumeSnapshotEntity> {
+public class GlusterVolumeSnapshotStatusColumn extends
AbstractColumn<GlusterVolumeSnapshotEntity, GlusterVolumeSnapshotEntity> {
public GlusterVolumeSnapshotStatusColumn() {
super(new GlusterVolumeSnapshotStatusCell());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostStatusColumn.java
index 067ef46..82f5e04 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostStatusColumn.java
@@ -5,12 +5,12 @@
import org.ovirt.engine.core.common.businessentities.VDS;
import org.ovirt.engine.core.common.businessentities.VDSStatus;
import org.ovirt.engine.core.common.utils.PairQueryable;
-import org.ovirt.engine.ui.common.widget.table.column.AbstractSortableColumn;
+import org.ovirt.engine.ui.common.widget.table.column.AbstractColumn;
import org.ovirt.engine.ui.uicommonweb.Linq;
import org.ovirt.engine.ui.uicommonweb.Linq.IdentifiableComparator;
import org.ovirt.engine.ui.webadmin.widget.table.cell.HostStatusCell;
-public class HostStatusColumn<S> extends AbstractSortableColumn<S, VDS> {
+public class HostStatusColumn<S> extends AbstractColumn<S, VDS> {
public HostStatusColumn() {
super(new HostStatusCell());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDeviceStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDeviceStatusColumn.java
index 969d73d..d0aa862 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDeviceStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/StorageDeviceStatusColumn.java
@@ -1,10 +1,10 @@
package org.ovirt.engine.ui.webadmin.widget.table.column;
import org.ovirt.engine.core.common.businessentities.gluster.StorageDevice;
-import org.ovirt.engine.ui.common.widget.table.column.AbstractSortableColumn;
+import org.ovirt.engine.ui.common.widget.table.column.AbstractColumn;
import org.ovirt.engine.ui.uicommonweb.Linq;
-public class StorageDeviceStatusColumn extends
AbstractSortableColumn<StorageDevice, StorageDevice> {
+public class StorageDeviceStatusColumn extends AbstractColumn<StorageDevice,
StorageDevice> {
public StorageDeviceStatusColumn() {
super(new StorageDeviceStatusCell());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusColumn.java
index 7338428..ebdb553 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusColumn.java
@@ -6,7 +6,7 @@
import org.ovirt.engine.core.common.businessentities.VMStatus;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
import org.ovirt.engine.core.common.utils.PairQueryable;
-import org.ovirt.engine.ui.common.widget.table.column.AbstractSortableColumn;
+import org.ovirt.engine.ui.common.widget.table.column.AbstractColumn;
import org.ovirt.engine.ui.uicommonweb.Linq;
import org.ovirt.engine.ui.uicommonweb.Linq.IdentifiableComparator;
import org.ovirt.engine.ui.webadmin.widget.table.cell.VmStatusCell;
@@ -14,7 +14,7 @@
/**
* Image column that corresponds to XAML {@code VmStatusTemplate}.
*/
-public class VmStatusColumn<T> extends AbstractSortableColumn<T, VM> {
+public class VmStatusColumn<T> extends AbstractColumn<T, VM> {
public VmStatusColumn() {
super(new VmStatusCell());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeStatusColumn.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeStatusColumn.java
index 3f7d7eb..f4c599c 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeStatusColumn.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeStatusColumn.java
@@ -1,10 +1,10 @@
package org.ovirt.engine.ui.webadmin.widget.table.column;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity;
-import org.ovirt.engine.ui.common.widget.table.column.AbstractSortableColumn;
+import org.ovirt.engine.ui.common.widget.table.column.AbstractColumn;
import org.ovirt.engine.ui.webadmin.widget.table.cell.VolumeStatusCell;
-public class VolumeStatusColumn extends
AbstractSortableColumn<GlusterVolumeEntity, GlusterVolumeEntity> {
+public class VolumeStatusColumn extends AbstractColumn<GlusterVolumeEntity,
GlusterVolumeEntity> {
public VolumeStatusColumn() {
super(new VolumeStatusCell());
--
To view, visit https://gerrit.ovirt.org/38702
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d26f817b3e79e996590873fef782fac14967fd1
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
