Eli Mesika has uploaded a new change for review. Change subject: webadmin: rename NetworkRoleColumnHelper ......................................................................
webadmin: rename NetworkRoleColumnHelper Rename webadmin: rename NetworkRoleColumnHelper to MultiImageColumnHelper Change-Id: I380248c9694ddfe57052a41b9b991aa67830ba4d Signed-off-by: emesika <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.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/cluster/SubTabClusterNetworkView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java R frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/MultiImageColumnHelper.java 5 files changed, 17 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/40998/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java index 9f7e6d9..890b03a 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterManageNetworkPopupView.java @@ -21,7 +21,7 @@ import org.ovirt.engine.ui.webadmin.ApplicationTemplates; import org.ovirt.engine.ui.webadmin.gin.AssetProvider; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.cluster.ClusterManageNetworkPopupPresenterWidget; -import org.ovirt.engine.ui.webadmin.widget.table.column.NetworkRoleColumnHelper; +import org.ovirt.engine.ui.webadmin.widget.table.column.MultiImageColumnHelper; import com.google.gwt.cell.client.Cell.Context; import com.google.gwt.cell.client.FieldUpdater; @@ -165,15 +165,15 @@ @Override public SafeHtml getValue(ClusterNetworkModel clusterNetworkModel) { - return NetworkRoleColumnHelper.getValue(Collections.singletonList(clusterNetworkModel.isVmNetwork() ? + return MultiImageColumnHelper.getValue(Collections.singletonList(clusterNetworkModel.isVmNetwork() ? vmImage : emptyImage)); } @Override public SafeHtml getTooltip(ClusterNetworkModel clusterNetworkModel) { - return NetworkRoleColumnHelper.getTooltip(clusterNetworkModel.isVmNetwork() ? + return MultiImageColumnHelper.getTooltip(clusterNetworkModel.isVmNetwork() ? Collections.singletonMap(vmImage, constants.vmItemInfo()) - : Collections.<SafeHtml, String> emptyMap()); + : Collections.<SafeHtml, String>emptyMap()); } } 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 c270c66..da2c8b6 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 @@ -21,7 +21,7 @@ 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 org.ovirt.engine.ui.webadmin.widget.table.column.MultiImageColumnHelper; import com.google.gwt.cell.client.FieldUpdater; import com.google.gwt.core.client.GWT; @@ -105,7 +105,7 @@ images.add(emptyImage); } - return NetworkRoleColumnHelper.getValue(images); + return MultiImageColumnHelper.getValue(images); } @Override @@ -116,7 +116,7 @@ } - return NetworkRoleColumnHelper.getTooltip(imagesToText); + return MultiImageColumnHelper.getTooltip(imagesToText); } }; diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterNetworkView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterNetworkView.java index d3ecf54..6bf6d0d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterNetworkView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterNetworkView.java @@ -24,7 +24,7 @@ import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.cluster.SubTabClusterNetworkPresenter; import org.ovirt.engine.ui.webadmin.section.main.view.AbstractSubTabTableView; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition; -import org.ovirt.engine.ui.webadmin.widget.table.column.NetworkRoleColumnHelper; +import org.ovirt.engine.ui.webadmin.widget.table.column.MultiImageColumnHelper; import org.ovirt.engine.ui.webadmin.widget.table.column.NetworkStatusColumn; import com.google.gwt.core.client.GWT; @@ -128,7 +128,7 @@ } } - return NetworkRoleColumnHelper.getValue(images); + return MultiImageColumnHelper.getValue(images); } @Override @@ -151,7 +151,7 @@ imagesToText.put(glusterNwImage, constants.glusterNwItemInfo()); } } - return NetworkRoleColumnHelper.getTooltip(imagesToText); + return MultiImageColumnHelper.getTooltip(imagesToText); } }; diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java index 642aa72..de41074 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java @@ -25,8 +25,8 @@ import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.network.SubTabNetworkClusterPresenter; import org.ovirt.engine.ui.webadmin.section.main.view.AbstractSubTabTableView; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition; +import org.ovirt.engine.ui.webadmin.widget.table.column.MultiImageColumnHelper; import org.ovirt.engine.ui.webadmin.widget.table.column.NetworkClusterStatusColumn; -import org.ovirt.engine.ui.webadmin.widget.table.column.NetworkRoleColumnHelper; import com.google.gwt.core.client.GWT; import com.google.gwt.safehtml.shared.SafeHtml; @@ -158,7 +158,7 @@ } } - return NetworkRoleColumnHelper.getValue(images); + return MultiImageColumnHelper.getValue(images); } @Override @@ -182,7 +182,7 @@ } } - return NetworkRoleColumnHelper.getTooltip(imagesToText); + return MultiImageColumnHelper.getTooltip(imagesToText); } }; netRoleColumn.makeSortable(new Comparator<PairQueryable<VDSGroup, NetworkCluster>>() { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkRoleColumnHelper.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/MultiImageColumnHelper.java similarity index 81% rename from frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkRoleColumnHelper.java rename to frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/MultiImageColumnHelper.java index 7b5941c..f819a4b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkRoleColumnHelper.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/MultiImageColumnHelper.java @@ -3,15 +3,17 @@ import java.util.List; import java.util.Map; +import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.ApplicationTemplates; import org.ovirt.engine.ui.webadmin.gin.AssetProvider; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlUtils; -public class NetworkRoleColumnHelper { +public class MultiImageColumnHelper { private final static ApplicationTemplates templates = AssetProvider.getTemplates(); + private final static ApplicationConstants constants = AssetProvider.getConstants(); public static SafeHtml getValue(List<SafeHtml> imagesHtml) { String images = ""; //$NON-NLS-1$ @@ -28,7 +30,7 @@ for (Map.Entry<SafeHtml, String> imageToText : imagesToText.entrySet()) { if (!tooltip.isEmpty()) { - tooltip = tooltip.concat("<BR>"); //$NON-NLS-1$ + tooltip = tooltip.concat(constants.lineBreak()); //$NON-NLS-1$ } tooltip = tooltip.concat(templates.imageTextSetupNetwork(imageToText.getKey(), imageToText.getValue()).asString()); -- To view, visit https://gerrit.ovirt.org/40998 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I380248c9694ddfe57052a41b9b991aa67830ba4d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
