Alexander Wels has uploaded a new change for review. Change subject: webadmin: generic no items to display message ......................................................................
webadmin: generic no items to display message - Changed the no XX to display message to a generic no items to display message to help translations. Change-Id: Ide108ff983dadf209acf00577580116fe114bc82 Signed-off-by: Alexander Wels <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/NoItemsLabel.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/AbstractSubTabTreeView.java 5 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/14150/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index 618198f..01dab3c 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -1226,4 +1226,7 @@ @DefaultStringValue("Not Configured") String notConfigured(); + + @DefaultStringValue("No items to display") + String noItemsToDisplay(); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java index d5d1cc8..8e33a95 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationMessages.java @@ -80,9 +80,6 @@ @DefaultMessage("Clone VM from Snapshot is supported only for Clusters of version {0} and above") String cloneVmNotSupported(String minimalClusterVersion); - @DefaultMessage("No {0} to display") - String noItemsToDisplay(String items); - @DefaultMessage("{0} ({1} GB free of {2} GB)") String storageDomainFreeSpace(String name, int free, int total); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/NoItemsLabel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/NoItemsLabel.java index c6603f3..a5d4bc3 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/NoItemsLabel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/label/NoItemsLabel.java @@ -1,6 +1,6 @@ package org.ovirt.engine.ui.common.widget.label; -import org.ovirt.engine.ui.common.CommonApplicationMessages; +import org.ovirt.engine.ui.common.CommonApplicationConstants; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; @@ -14,14 +14,14 @@ WidgetUiBinder uiBinder = GWT.create(WidgetUiBinder.class); } - private static final CommonApplicationMessages messages = GWT.create(CommonApplicationMessages.class); + private static final CommonApplicationConstants constants = GWT.create(CommonApplicationConstants.class); @UiField Label label; - public NoItemsLabel(String itemType) { + public NoItemsLabel() { super(); initWidget(WidgetUiBinder.uiBinder.createAndBindUi(this)); - label.setText(messages.noItemsToDisplay(itemType)); + label.setText(constants.noItemsToDisplay()); } } 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 02f9374..b597be8 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 @@ -218,7 +218,7 @@ this.selectionModel.setDataDisplay(table); //Default to 'no items to display' - this.table.setEmptyTableWidget(new NoItemsLabel(dataProvider.getModel().getTitle())); + this.table.setEmptyTableWidget(new NoItemsLabel()); } protected void updateTableControls() { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/AbstractSubTabTreeView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/AbstractSubTabTreeView.java index fb3c238..1e1c82d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/AbstractSubTabTreeView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/AbstractSubTabTreeView.java @@ -105,7 +105,7 @@ ListModel model = (ListModel) sender; Iterable<M> items = model.getItems(); if (model.getItems() == null || (items instanceof List && ((List<M>) items).isEmpty())) { - table.setEmptyTableWidget(new NoItemsLabel(model.getTitle())); + table.setEmptyTableWidget(new NoItemsLabel()); } else { table.setEmptyTableWidget(null); } -- To view, visit http://gerrit.ovirt.org/14150 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ide108ff983dadf209acf00577580116fe114bc82 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
