Greg Sheremeta has uploaded a new change for review. Change subject: webadmin: display contents of comments instead of icon ......................................................................
webadmin: display contents of comments instead of icon Changed all of the comment columns in grids to display the comment contents instead of the icon. Also switched the header from the icon to the word "Comment". Change-Id: If3fc02811992fefe1723e9cd273e057e3639e310 Bug-Url: https://bugzilla.redhat.com/1122990 Signed-off-by: Greg Sheremeta <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDataCenterView.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/MainTabNetworkView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.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/CommentColumn.java 9 files changed, 143 insertions(+), 55 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/38176/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java index ea60642..eb2e54c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java @@ -25,11 +25,9 @@ import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminImageButtonDefinition; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminMenuBarButtonDefinition; -import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn; import com.google.gwt.core.client.GWT; import com.google.gwt.safehtml.shared.SafeHtml; -import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.inject.Inject; public class MainTabClusterView extends AbstractMainTabWithDetailsTableView<VDSGroup, ClusterListModel> implements @@ -65,10 +63,21 @@ nameColumn.makeSortable(ClusterConditionFieldAutoCompleter.NAME); getTable().addColumn(nameColumn, constants.nameCluster(), "150px"); //$NON-NLS-1$ - CommentColumn<VDSGroup> commentColumn = new CommentColumn<VDSGroup>(); + AbstractTextColumn<VDSGroup> commentColumn = new AbstractTextColumn<VDSGroup>() { + + @Override + public String getValue(VDSGroup vdsGroup) { + return vdsGroup.getComment(); + } + + @Override + public SafeHtml getTooltip(VDSGroup object) { + return null; + } + }; getTable().addColumn(commentColumn, - new SafeHtmlHeader(commentColumn.getHeaderHtml(), SafeHtmlUtils.fromSafeConstant(constants.commentLabel())), - "30px"); //$NON-NLS-1$ + SafeHtmlHeader.fromSafeConstant(constants.commentLabel()), + "75px"); //$NON-NLS-1$ if (ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly) { AbstractTextColumn<VDSGroup> dataCenterColumn = new AbstractTextColumn<VDSGroup>() { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDataCenterView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDataCenterView.java index 8c98090..b99e813 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDataCenterView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDataCenterView.java @@ -27,12 +27,10 @@ import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminImageButtonDefinition; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminMenuBarButtonDefinition; -import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.DcStatusColumn; import com.google.gwt.core.client.GWT; import com.google.gwt.safehtml.shared.SafeHtml; -import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.inject.Inject; public class MainTabDataCenterView extends AbstractMainTabWithDetailsTableView<StoragePool, DataCenterListModel> implements MainTabDataCenterPresenter.ViewDef { @@ -69,10 +67,21 @@ nameColumn.makeSortable(StoragePoolFieldAutoCompleter.NAME); getTable().addColumn(nameColumn, constants.nameDc(), "150px"); //$NON-NLS-1$ - CommentColumn<StoragePool> commentColumn = new CommentColumn<StoragePool>(); + AbstractTextColumn<StoragePool> commentColumn = new AbstractTextColumn<StoragePool>() { + + @Override + public String getValue(StoragePool storagePool) { + return storagePool.getComment(); + } + + @Override + public SafeHtml getTooltip(StoragePool object) { + return null; + } + }; getTable().addColumn(commentColumn, - new SafeHtmlHeader(commentColumn.getHeaderHtml(), SafeHtmlUtils.fromSafeConstant(constants.commentLabel())), - "30px"); //$NON-NLS-1$ + SafeHtmlHeader.fromSafeConstant(constants.commentLabel()), + "75px"); //$NON-NLS-1$ AbstractTextColumn<StoragePool> storageTypeColumn = new AbstractBooleanColumn<StoragePool>( constants.storageTypeLocal(), constants.storageTypeShared()) { 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 28257f3..3729d19 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 @@ -27,19 +27,18 @@ import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.IEventListener; import org.ovirt.engine.ui.webadmin.ApplicationConstants; +import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.MainTabHostPresenter; import org.ovirt.engine.ui.webadmin.section.main.view.AbstractMainTabWithDetailsTableView; import org.ovirt.engine.ui.webadmin.uicommon.ReportActionsHelper; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminMenuBarButtonDefinition; import org.ovirt.engine.ui.webadmin.widget.table.column.AbstractPercentColumn; -import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.HostStatusColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.VmCountColumn; import com.google.gwt.core.client.GWT; import com.google.gwt.safehtml.shared.SafeHtml; -import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.inject.Inject; public class MainTabHostView extends AbstractMainTabWithDetailsTableView<VDS, HostListModel> implements MainTabHostPresenter.ViewDef { @@ -52,13 +51,16 @@ int maxSpmPriority; int defaultSpmPriority; ApplicationConstants constants; + ApplicationResources resources; @Inject - public MainTabHostView(MainModelProvider<VDS, HostListModel> modelProvider, ApplicationConstants constants) { + public MainTabHostView(MainModelProvider<VDS, HostListModel> modelProvider, ApplicationConstants constants, + ApplicationResources resources) { super(modelProvider); ViewIdHandler.idHandler.generateAndSetIds(this); this.constants = constants; + this.resources = resources; InitSpmPriorities(); } @@ -113,10 +115,21 @@ nameColumn.makeSortable(VdsConditionFieldAutoCompleter.NAME); getTable().addColumn(nameColumn, constants.nameHost(), "150px"); //$NON-NLS-1$ - CommentColumn<VDS> commentColumn = new CommentColumn<VDS>(); + AbstractTextColumn<VDS> commentColumn = new AbstractTextColumn<VDS>() { + + @Override + public String getValue(VDS vds) { + return vds.getComment(); + } + + @Override + public SafeHtml getTooltip(VDS object) { + return null; + } + }; getTable().addColumn(commentColumn, - new SafeHtmlHeader(commentColumn.getHeaderHtml(), SafeHtmlUtils.fromSafeConstant(constants.commentLabel())), - "30px"); //$NON-NLS-1$ + SafeHtmlHeader.fromSafeConstant(constants.commentLabel()), + "75px"); //$NON-NLS-1$ AbstractTextColumn<VDS> hostColumn = new AbstractTextColumn<VDS>() { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java index d787b07..6ddd1cc 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java @@ -5,13 +5,6 @@ import java.util.List; import java.util.Map; -import com.google.gwt.cell.client.FieldUpdater; -import com.google.gwt.core.client.GWT; -import com.google.gwt.safehtml.shared.SafeHtml; -import com.google.gwt.safehtml.shared.SafeHtmlUtils; -import com.google.gwt.user.client.ui.AbstractImagePrototype; -import com.google.inject.Inject; - import org.ovirt.engine.core.common.businessentities.network.NetworkView; import org.ovirt.engine.core.searchbackend.NetworkConditionFieldAutoCompleter; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; @@ -27,8 +20,14 @@ import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.MainTabNetworkPresenter; import org.ovirt.engine.ui.webadmin.section.main.view.AbstractMainTabWithDetailsTableView; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition; -import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.NetworkRoleColumnHelper; + +import com.google.gwt.cell.client.FieldUpdater; +import com.google.gwt.core.client.GWT; +import com.google.gwt.safehtml.shared.SafeHtml; +import com.google.gwt.safehtml.shared.SafeHtmlUtils; +import com.google.gwt.user.client.ui.AbstractImagePrototype; +import com.google.inject.Inject; public class MainTabNetworkView extends AbstractMainTabWithDetailsTableView<NetworkView, NetworkListModel> implements MainTabNetworkPresenter.ViewDef { @@ -37,6 +36,7 @@ } private final ApplicationConstants constants; + private final ApplicationResources resources; private final SafeHtml vmImage; private final SafeHtml emptyImage; @@ -49,6 +49,7 @@ ApplicationResources resources) { super(modelProvider); this.constants = constants; + this.resources = resources; ViewIdHandler.idHandler.generateAndSetIds(this); vmImage = SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.networkVm()).getHTML()); emptyImage = SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.networkEmpty()).getHTML()); @@ -74,10 +75,21 @@ getTable().addColumn(nameColumn, constants.nameNetwork(), "200px"); //$NON-NLS-1$ - CommentColumn<NetworkView> commentColumn = new CommentColumn<>(); + AbstractTextColumn<NetworkView> commentColumn = new AbstractTextColumn<NetworkView>() { + + @Override + public String getValue(NetworkView networkView) { + return networkView.getComment(); + } + + @Override + public SafeHtml getTooltip(NetworkView object) { + return null; + } + }; getTable().addColumn(commentColumn, - new SafeHtmlHeader(commentColumn.getHeaderHtml(), SafeHtmlUtils.fromSafeConstant(constants.commentLabel())), - "30px"); //$NON-NLS-1$ + SafeHtmlHeader.fromSafeConstant(constants.commentLabel()), + "75px"); //$NON-NLS-1$ AbstractTextColumn<NetworkView> dcColumn = new AbstractTextColumn<NetworkView>() { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java index fa898f9..d8f9e4c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java @@ -11,14 +11,13 @@ import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.models.pools.PoolListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; +import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.MainTabPoolPresenter; import org.ovirt.engine.ui.webadmin.section.main.view.AbstractMainTabWithDetailsTableView; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition; -import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn; import com.google.gwt.core.client.GWT; import com.google.gwt.safehtml.shared.SafeHtml; -import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.inject.Inject; public class MainTabPoolView extends AbstractMainTabWithDetailsTableView<VmPool, PoolListModel> implements MainTabPoolPresenter.ViewDef { @@ -28,14 +27,15 @@ } @Inject - public MainTabPoolView(MainModelProvider<VmPool, PoolListModel> modelProvider, ApplicationConstants constants) { + public MainTabPoolView(MainModelProvider<VmPool, PoolListModel> modelProvider, ApplicationConstants constants, + ApplicationResources resources) { super(modelProvider); ViewIdHandler.idHandler.generateAndSetIds(this); - initTable(constants); + initTable(constants, resources); initWidget(getTable()); } - void initTable(ApplicationConstants constants) { + void initTable(ApplicationConstants constants, ApplicationResources resources) { getTable().enableColumnResizing(); AbstractTextColumn<VmPool> nameColumn = new AbstractTextColumn<VmPool>() { @@ -52,10 +52,21 @@ nameColumn.makeSortable(PoolConditionFieldAutoCompleter.NAME); getTable().addColumn(nameColumn, constants.namePool(), "150px"); //$NON-NLS-1$ - CommentColumn<VmPool> commentColumn = new CommentColumn<VmPool>(); + AbstractTextColumn<VmPool> commentColumn = new AbstractTextColumn<VmPool>() { + + @Override + public String getValue(VmPool vmPool) { + return vmPool.getComment(); + } + + @Override + public SafeHtml getTooltip(VmPool object) { + return null; + } + }; getTable().addColumn(commentColumn, - new SafeHtmlHeader(commentColumn.getHeaderHtml(), SafeHtmlUtils.fromSafeConstant(constants.commentLabel())), - "30px"); //$NON-NLS-1$ + SafeHtmlHeader.fromSafeConstant(constants.commentLabel()), + "75px"); //$NON-NLS-1$ AbstractTextColumn<VmPool> assignedColumn = new AbstractTextColumn<VmPool>() { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java index ba3ac02..873c1ba 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java @@ -23,17 +23,16 @@ import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.IEventListener; import org.ovirt.engine.ui.webadmin.ApplicationConstants; +import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.MainTabStoragePresenter; import org.ovirt.engine.ui.webadmin.section.main.view.AbstractMainTabWithDetailsTableView; import org.ovirt.engine.ui.webadmin.uicommon.ReportActionsHelper; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminMenuBarButtonDefinition; -import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.StorageDomainSharedStatusColumn; import com.google.gwt.core.client.GWT; import com.google.gwt.safehtml.shared.SafeHtml; -import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.inject.Inject; public class MainTabStorageView extends AbstractMainTabWithDetailsTableView<StorageDomain, StorageListModel> implements MainTabStoragePresenter.ViewDef { @@ -44,14 +43,14 @@ @Inject public MainTabStorageView(MainModelProvider<StorageDomain, StorageListModel> modelProvider, - ApplicationConstants constants) { + ApplicationConstants constants, ApplicationResources resources) { super(modelProvider); ViewIdHandler.idHandler.generateAndSetIds(this); - initTable(constants); + initTable(constants, resources); initWidget(getTable()); } - void initTable(final ApplicationConstants constants) { + void initTable(final ApplicationConstants constants, ApplicationResources resources) { getTable().enableColumnResizing(); getTable().addColumn(new StorageDomainSharedStatusColumn(), constants.empty(), "30px"); //$NON-NLS-1$ @@ -70,10 +69,21 @@ nameColumn.makeSortable(StorageDomainFieldAutoCompleter.NAME); getTable().addColumn(nameColumn, constants.domainNameStorage(), "150px"); //$NON-NLS-1$ - CommentColumn<StorageDomain> commentColumn = new CommentColumn<StorageDomain>(); + AbstractTextColumn<StorageDomain> commentColumn = new AbstractTextColumn<StorageDomain>() { + + @Override + public String getValue(StorageDomain storageDomain) { + return storageDomain.getComment(); + } + + @Override + public SafeHtml getTooltip(StorageDomain object) { + return null; + } + }; getTable().addColumn(commentColumn, - new SafeHtmlHeader(commentColumn.getHeaderHtml(), SafeHtmlUtils.fromSafeConstant(constants.commentLabel())), - "30px"); //$NON-NLS-1$ + SafeHtmlHeader.fromSafeConstant(constants.commentLabel()), + "75px"); //$NON-NLS-1$ AbstractTextColumn<StorageDomain> domainTypeColumn = new AbstractEnumColumn<StorageDomain, StorageDomainType>() { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java index c5026b4..1370400 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java @@ -14,15 +14,14 @@ import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; +import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.MainTabTemplatePresenter; import org.ovirt.engine.ui.webadmin.section.main.view.AbstractMainTabWithDetailsTableView; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition; import org.ovirt.engine.ui.webadmin.widget.table.column.AbstractGeneralDateTimeColumn; -import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn; import com.google.gwt.core.client.GWT; import com.google.gwt.safehtml.shared.SafeHtml; -import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.inject.Inject; public class MainTabTemplateView extends AbstractMainTabWithDetailsTableView<VmTemplate, TemplateListModel> implements MainTabTemplatePresenter.ViewDef { @@ -32,14 +31,15 @@ } @Inject - public MainTabTemplateView(MainModelProvider<VmTemplate, TemplateListModel> modelProvider, ApplicationConstants constants) { + public MainTabTemplateView(MainModelProvider<VmTemplate, TemplateListModel> modelProvider, ApplicationConstants constants, + ApplicationResources resources) { super(modelProvider); ViewIdHandler.idHandler.generateAndSetIds(this); - initTable(constants); + initTable(constants, resources); initWidget(getTable()); } - void initTable(ApplicationConstants constants) { + void initTable(ApplicationConstants constants, ApplicationResources resources) { getTable().enableColumnResizing(); AbstractTextColumn<VmTemplate> nameColumn = new AbstractTextColumn<VmTemplate>() { @@ -76,10 +76,21 @@ versionNameColumn.makeSortable(VmTemplateConditionFieldAutoCompleter.VERSION_NAME_AND_NUMBER); getTable().addColumn(versionNameColumn, constants.versionTemplate(), "150px"); //$NON-NLS-1$ - CommentColumn<VmTemplate> commentColumn = new CommentColumn<VmTemplate>(); + AbstractTextColumn<VmTemplate> commentColumn = new AbstractTextColumn<VmTemplate>() { + + @Override + public String getValue(VmTemplate vmTemplate) { + return vmTemplate.getComment(); + } + + @Override + public SafeHtml getTooltip(VmTemplate object) { + return null; + } + }; getTable().addColumn(commentColumn, - new SafeHtmlHeader(commentColumn.getHeaderHtml(), SafeHtmlUtils.fromSafeConstant(constants.commentLabel())), - "30px"); //$NON-NLS-1$ + SafeHtmlHeader.fromSafeConstant(constants.commentLabel()), + "75px"); //$NON-NLS-1$ AbstractTextColumn<VmTemplate> creationDateColumn = new AbstractGeneralDateTimeColumn<VmTemplate>() { @Override 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 954a5e9..933e9eb 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 @@ -38,7 +38,6 @@ import org.ovirt.engine.ui.webadmin.widget.table.column.AbstractPercentColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.AbstractProgressBarColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.AbstractUptimeColumn; -import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.VmStatusColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.VmTypeColumn; @@ -95,10 +94,21 @@ nameColumn.makeSortable(VmConditionFieldAutoCompleter.NAME); getTable().addColumn(nameColumn, constants.nameVm(), "120px"); //$NON-NLS-1$ - CommentColumn<VM> commentColumn = new CommentColumn<VM>(); + AbstractTextColumn<VM> commentColumn = new AbstractTextColumn<VM>() { + + @Override + public String getValue(VM vm) { + return vm.getComment(); + } + + @Override + public SafeHtml getTooltip(VM object) { + return null; + } + }; getTable().addColumn(commentColumn, - new SafeHtmlHeader(commentColumn.getHeaderHtml(), SafeHtmlUtils.fromSafeConstant(constants.commentLabel())), - "30px"); //$NON-NLS-1$ + SafeHtmlHeader.fromSafeConstant(constants.commentLabel()), + "75px"); //$NON-NLS-1$ AbstractTextColumn<VM> hostColumn = new AbstractTextColumn<VM>() { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java index 5d97842..db3dd4c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/CommentColumn.java @@ -10,8 +10,11 @@ * Column that render a comment image (yellow paper icon) that, when hovered, shows the * actual comment in a tooltip. * + * Deprecated -- we now show the full comment (truncated, if necessary) in a comment column. + * * @param <T> row type */ +@Deprecated public class CommentColumn<T extends Commented> extends AbstractWebAdminImageResourceColumn<T> { /** -- To view, visit https://gerrit.ovirt.org/38176 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3fc02811992fefe1723e9cd273e057e3639e310 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
