Greg Sheremeta has uploaded a new change for review. Change subject: webadmin: 'remove' confirmation dialog message cleanup ......................................................................
webadmin: 'remove' confirmation dialog message cleanup Changed the 'remove' confirmation dialog to use a default message, but allow an override. Cleaned up useless calls to set dialog's message to prevent regressions. Removed related unused UI constants. Change-Id: I7411dec0eaf8d60cefff563988618f7c548eecce Bug-Url: https://bugzilla.redhat.com/1021584 Signed-off-by: Greg Sheremeta <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/AbstractConfirmationPopupView.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RolePermissionListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworkQoSModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/RemoveProvidersModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVmInterfaceModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVnicProfileModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 33 files changed, 12 insertions(+), 113 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/20471/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/AbstractConfirmationPopupView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/AbstractConfirmationPopupView.java index 63cc941..41cdffe 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/AbstractConfirmationPopupView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/AbstractConfirmationPopupView.java @@ -12,7 +12,7 @@ @UiField @Ignore - public HTML messageHTML; + public HTML messageHTML = new HTML(); public AbstractConfirmationPopupView(EventBus eventBus, CommonApplicationResources resources) { super(eventBus, resources); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java index 9322ca1..850f071 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java @@ -76,17 +76,23 @@ force.setLabel(constants.forceRemove()); this.constants= constants; this.messages = messages; + setMessageToDefault(); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); ViewIdHandler.idHandler.generateAndSetIds(this); localize(constants); driver.initialize(this); } + protected void setMessageToDefault() { + super.setMessage(constants.removeConfirmationPopupMessage()); + } + @Override public void setMessage(String message) { - if (getHashName() != null && getHashName().startsWith("remove_")) { //$NON-NLS-1$ - super.setMessage(constants.removeConfirmationPopupMessage()); - } else { + if (message == null) { + setMessageToDefault(); + } + else { super.setMessage(message); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java index d33e5ab..e2bb04f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/bookmarks/BookmarkListModel.java @@ -189,7 +189,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeBookmarksTitle()); model.setHashName("remove_bookmark"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().bookmarsMsg()); ArrayList<String> list = new ArrayList<String>(); for (Object item : getSelectedItems()) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java index 5e07104..a173d6a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java @@ -458,7 +458,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeClusterTitle()); model.setHashName("remove_cluster"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().clustersMsg()); ArrayList<String> list = new ArrayList<String>(); for (VDSGroup a : Linq.<VDSGroup> cast(getSelectedItems())) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java index a26a434..6675e64 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java @@ -145,7 +145,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removePermissionTitle()); model.setHashName("remove_permission"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().permissionMsg()); model.setItems(getSelectedItems()); UICommand tempVar = new UICommand("OnRemove", this); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java index 0c030bf..46e6b03 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java @@ -216,7 +216,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeSystemPermissionsTitle()); model.setHashName("remove_system_permission"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().systemPermissionsMsg()); model.setItems(getSelectedItems()); UICommand tempVar = new UICommand("OnRemove", this); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java index 823683f..045a7cf 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java @@ -258,7 +258,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeRolesTitle()); model.setHashName("remove_role"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().rolesMsg()); ArrayList<String> list = new ArrayList<String>(); for (Role role : Linq.<Role> cast(getSelectedItems())) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RolePermissionListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RolePermissionListModel.java index 2a32358..73f6e32 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RolePermissionListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RolePermissionListModel.java @@ -124,7 +124,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removePermissionTitle()); model.setHashName("remove_permission"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().permissionMsg()); model.setItems(getSelectedItems()); UICommand tempVar = new UICommand("OnRemove", this); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyListModel.java index 223a43a..72adc51 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyListModel.java @@ -221,7 +221,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeClusterPolicyTitle()); model.setHashName("remove_cluster_policy"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().removeClusterPolicyMessage()); if (getSelectedItems() == null) { return; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java index acce345..5478ff0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java @@ -356,7 +356,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeDataCenterTitle()); model.setHashName("remove_data_center"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().dataCentersMsg()); ArrayList<String> list = new ArrayList<String>(); for (StoragePool a : Linq.<StoragePool> cast(getSelectedItems())) @@ -381,7 +380,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().forceRemoveDataCenterTitle()); model.setHashName("force_remove_data_center"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().dataCentersMsg()); model.getLatch().setIsAvailable(true); model.getLatch().setIsChangable(true); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworkQoSModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworkQoSModel.java index 946d441..ff39f4c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworkQoSModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworkQoSModel.java @@ -54,12 +54,12 @@ public void executed(FrontendMultipleQueryAsyncResult result) { ArrayList<VnicProfileView> vnicProfiles = new ArrayList<VnicProfileView>(); + setHashName("remove_network_qos"); //$NON-NLS-1$ + for (VdcQueryReturnValue returnValue : result.getReturnValues()) { vnicProfiles.addAll((ArrayList<VnicProfileView>) returnValue.getReturnValue()); } if (vnicProfiles.isEmpty()) { - setHashName("remove_network_qos"); //$NON-NLS-1$ - ArrayList<String> list = new ArrayList<String>(); for (Object item : sourceListModel.getSelectedItems()) { NetworkQoS i = (NetworkQoS) item; @@ -67,8 +67,6 @@ } setItems(list); } else { - // name start with underscore to prevent default message - setHashName("_remove_network_qos"); //$NON-NLS-1$ setMessage(ConstantsManager.getInstance().getMessages().removeNetworkQoSMessage(vnicProfiles.size())); ArrayList<String> list = new ArrayList<String>(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java index c6ac726..54b1d40 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java @@ -24,7 +24,6 @@ setTitle(ConstantsManager.getInstance().getConstants().removeLogicalNetworkTitle()); setHashName("remove_logical_network"); //$NON-NLS-1$ - setMessage(ConstantsManager.getInstance().getConstants().logicalNetworksMsg()); ArrayList<String> list = new ArrayList<String>(); boolean hasNetworkWithProvider = false; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java index 5390efc..3f54f62 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java @@ -443,7 +443,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeDisksTitle()); model.setHashName("remove_disk"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().disksMsg()); model.getLatch().setIsAvailable(false); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java index 2e69b5d..1a8de25 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java @@ -1026,7 +1026,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeHostsTitle()); model.setHashName("remove_host"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().hostsMsg()); Set<Guid> clusters = new HashSet<Guid>(); ArrayList<String> list = new ArrayList<String>(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java index a2aeaf2..e37e710 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java @@ -356,7 +356,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removePoolsTitle()); model.setHashName("remove_pool"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().poolsMsg()); ArrayList<String> list = new ArrayList<String>(); for (VmPool item : Linq.<VmPool> cast(getSelectedItems())) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/RemoveProvidersModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/RemoveProvidersModel.java index c943a83..d6c7145 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/RemoveProvidersModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/RemoveProvidersModel.java @@ -33,7 +33,6 @@ setTitle(ConstantsManager.getInstance().getConstants().removeProviderTitle()); setHashName("remove_provider"); //$NON-NLS-1$ - setMessage(ConstantsManager.getInstance().getConstants().providersMsg()); List<String> providerNames = new ArrayList<String>(); for (Provider provider : providers) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java index 1affd35..2bbadbc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java @@ -621,7 +621,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeQuotasTitle()); model.setHashName("remove_quota"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().quotasMsg()); ArrayList<String> list = new ArrayList<String>(); for (Quota a : Linq.<Quota> cast(getSelectedItems())) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java index 6a4a837..b2d0475 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java @@ -189,7 +189,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeQuotaAssignmentFromUsersTitle()); model.setHashName("remove_quota_assignment_from_user"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().assignmentsMsg()); ArrayList<String> list = new ArrayList<String>(); for (permissions item : Linq.<permissions> cast(getSelectedItems())) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java index 25e5870..6b149d7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java @@ -138,7 +138,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeDisksTitle()); model.setHashName("remove_disk"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().disksMsg()); model.getLatch().setIsAvailable(false); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java index 6000a85..3a2c17f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java @@ -782,7 +782,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeStoragesTitle()); model.setHashName("remove_storage"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().areYouSureYouWantToRemoveTheStorageDomainMsg()); model.getFormat().setIsAvailable(false); StorageDomain storage = (StorageDomain) getSelectedItem(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java index d9ca20a..5cf9411 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java @@ -67,7 +67,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeBackedUpTemplatesTitle()); model.setHashName("remove_backed_up_template"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().templatesMsg()); ArrayList<String> items = new ArrayList<String>(); for (Object a : getSelectedItems()) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java index 355626b..a7de411 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java @@ -96,7 +96,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeBackedUpVMsTitle()); model.setHashName("remove_backed_up_vm"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().vmsMsg()); ArrayList<String> items = new ArrayList<String>(); for (Object item : getSelectedItems()) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java index c3538ae..97af308 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java @@ -428,7 +428,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeTagsTitle()); model.setHashName("remove_tag"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().tagsMsg()); ArrayList<Object> items = new ArrayList<Object>(); items.add(getSelectedItem().getName().getEntity()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java index 41fa483..ea179cf 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java @@ -151,7 +151,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeTemplateDisksTitle()); model.setHashName("remove_template_disks"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().templateDisksMsg()); ArrayList<DiskModel> disks = getSelectedItems() != null ? Linq.<DiskModel> cast(getSelectedItems()) : new ArrayList<DiskModel>(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java index 02ede92..55734de 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java @@ -793,7 +793,6 @@ confirmModel.setTitle(ConstantsManager.getInstance().getConstants().removeVirtualMachineTitle()); confirmModel.setHashName("remove_virtual_machine"); //$NON-NLS-1$ - confirmModel.setMessage(ConstantsManager.getInstance().getConstants().virtualMachineMsg()); ArrayList<String> list = new ArrayList<String>(); for (VM vm : getSelectedVms()) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java index 8371762..51e95d3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java @@ -353,7 +353,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeUsersTitle()); model.setHashName("remove_user"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().usersMsg()); ArrayList<String> list = new ArrayList<String>(); for (DbUser item : Linq.<DbUser> cast(getSelectedItems())) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java index eff7c72..8330825 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java @@ -123,7 +123,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removePermissionTitle()); model.setHashName("remove_permission"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().permissionMsg()); model.setItems(Linq.<permissions> cast(getSelectedItems())); UICommand tempVar = new UICommand("OnRemove", this); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVmInterfaceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVmInterfaceModel.java index 439401a..d74dc89 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVmInterfaceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVmInterfaceModel.java @@ -25,7 +25,6 @@ public RemoveVmInterfaceModel(ListModel sourceListModel, List<VmNetworkInterface> vnics, boolean isFullMsg) { setTitle(ConstantsManager.getInstance().getConstants().removeNetworkInterfacesTitle()); setHashName("remove_network_interface_vms"); //$NON-NLS-1$ - setMessage(ConstantsManager.getInstance().getConstants().networkInterfacesMsg()); this.sourceListModel = sourceListModel; this.vnics = vnics; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVnicProfileModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVnicProfileModel.java index 228ca7d..72d0063 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVnicProfileModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVnicProfileModel.java @@ -25,7 +25,6 @@ public RemoveVnicProfileModel(ListModel sourceListModel, List<VnicProfileView> profiles, boolean isFullMsg) { setTitle(ConstantsManager.getInstance().getConstants().removeVnicProfileTitle()); setHashName("remove_vnic_prfoile"); //$NON-NLS-1$ - setMessage(ConstantsManager.getInstance().getConstants().vnicProfilesMsg()); this.sourceListModel = sourceListModel; this.profiles = profiles; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java index 9cffc49..991d57a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java @@ -394,7 +394,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeDisksTitle()); model.setHashName("remove_disk"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().disksMsg()); model.getLatch().setEntity(false); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index 5e1ce6e..bb619ba 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -789,7 +789,6 @@ setWindow(window); window.setTitle(ConstantsManager.getInstance().getConstants().removeVirtualMachinesTitle()); window.setHashName("remove_virtual_machine"); //$NON-NLS-1$ - window.setMessage(ConstantsManager.getInstance().getConstants().virtualMachinesMsg()); vmsRemoveMap = new HashMap<Guid, EntityModel>(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java index 7850fec..58e09ae 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java @@ -287,7 +287,6 @@ setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().removeVolumesTitle()); model.setHashName("remove_volume"); //$NON-NLS-1$ - model.setMessage(ConstantsManager.getInstance().getConstants().removeVolumesMessage()); model.setNote(ConstantsManager.getInstance().getConstants().removeVolumesWarning()); if (getSelectedItems() == null) { diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index 64aa33c..5061c92 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -647,12 +647,6 @@ String cloneVmFromSnapshotTitle(); // Messages - @DefaultStringValue("Bookmark(s):") - String bookmarsMsg(); - - @DefaultStringValue("Cluster(s)") - String clustersMsg(); - @DefaultStringValue("You are about to change the Cluster Compatibility Version. Are you sure you want to continue?") String youAreAboutChangeClusterCompatibilityVersionMsg(); @@ -705,9 +699,6 @@ @DefaultStringValue("Network name shouldn't start with 'bond'.") String networkNameStartMsg(); - @DefaultStringValue("Data Center(s)") - String dataCentersMsg(); - @DefaultStringValue("There are no compatible Storage Domains to attach to this Data Center. Please add new Storage from the Storage tab.") String thereAreNoCompatibleStorageDomainsAttachThisDcMsg(); @@ -716,9 +707,6 @@ @DefaultStringValue("You are about to change the Data Center Compatibility Version. This will upgrade all the Storage Domains belonging to the Data Center. Are you sure you want to continue?") String youAreAboutChangeDcCompatibilityVersionWithUpgradeMsg(); - - @DefaultStringValue("Logical Network(s)") - String logicalNetworksMsg(); @DefaultStringValue("You are about to attach the network to all the selected clusters and to detach the network from all the unselected clusters.\n\nAre you sure you want to continue?") String youAreAboutToAttachDetachNetworkToFromTheClustersMsg(); @@ -729,14 +717,8 @@ @DefaultStringValue("Are you sure you want to Detach the following storage(s)?") String areYouSureYouWantDetachFollowingStoragesMsg(); - @DefaultStringValue("User(s)") - String usersMsg(); - @DefaultStringValue("Are you sure you want to Detach from the user the following Virtual Machine(s)") String areYouSureYouWantDetachFromUserFollowingVmsMsg(); - - @DefaultStringValue("Permission") - String permissionMsg(); @DefaultStringValue("Disks already exist on all available Storage Domains.") String disksAlreadyExistMsg(); @@ -746,9 +728,6 @@ @DefaultStringValue("There is no Export Domain to export the Template into. Please attach an Export Domain to the Template's Data Center.") String thereIsNoExportDomainToExportTheTemplateIntoMsg(); - - @DefaultStringValue("Template(s)") - String templatesMsg(); @DefaultStringValue("There are No Data Centers to which the Storage Domain can be attached") String thereAreNoDataCenterStorageDomainAttachedMsg(); @@ -765,9 +744,6 @@ @DefaultStringValue("Export Domain is not attached to any Data Center. Data can be retrieved only when the Domain is attached to a Data Center and is active") String ExportDomainIsNotAttachedToAnyDcMsg(); - @DefaultStringValue("Are you sure you want to Remove the Storage Domain?") - String areYouSureYouWantToRemoveTheStorageDomainMsg(); - @DefaultStringValue("The provider has the following certificates:\n") String theProviderHasTheFollowingCertificates(); @@ -777,23 +753,11 @@ @DefaultStringValue("Import provider certificates") String importProviderCertificatesTitle(); - @DefaultStringValue("VM(s)") - String vmsMsg(); - - @DefaultStringValue("Quota") - String quotasMsg(); - - @DefaultStringValue("Assignment(s)") - String assignmentsMsg(); - @DefaultStringValue("There are no networks available. Please add additional networks.") String thereAreNoNetworksAvailablePleaseAddAdditionalNetworksMsg(); @DefaultStringValue("There are no ISO versions that are compatible with the Host's current version.") String thereAreNoISOversionsVompatibleWithHostCurrentVerMsg(); - - @DefaultStringValue("Host(s)") - String hostsMsg(); @DefaultStringValue("Are you sure you want to place the following host(s) into maintenance mode?") String areYouSureYouWantToPlaceFollowingHostsIntoMaintenanceModeMsg(); @@ -810,9 +774,6 @@ @DefaultStringValue("Testing in progress. It will take a few seconds. Please wait...") String testingInProgressItWillTakeFewSecondsPleaseWaitMsg(); - @DefaultStringValue("Virtual Machine") - String virtualMachineMsg(); - @DefaultStringValue("Name must be up to 126 characters and start with any word character.") String nameMustBeUpToAndStartWithMsg(); @@ -821,12 +782,6 @@ @DefaultStringValue("Are you sure you want to detach selected Virtual Machine(s)?") String areYouSurYouWantToDetachSelectedVirtualMachinesMsg(); - - @DefaultStringValue("Pool(s)") - String poolsMsg(); - - @DefaultStringValue("Disk(s)") - String disksMsg(); @DefaultStringValue("Snapshot cannot be created since the VM is performing an operation on a Snapshot.") String snapshotCannotBeCreatedLockedSnapshotMsg(); @@ -839,15 +794,6 @@ @DefaultStringValue("At least one disk must be marked.") String atLeastOneDiskMustBeMarkedMsg(); - - @DefaultStringValue("Network Interface(s)") - String networkInterfacesMsg(); - - @DefaultStringValue("VM Interface Profile(s)") - String vnicProfilesMsg(); - - @DefaultStringValue("Virtual Machine(s)") - String virtualMachinesMsg(); @DefaultStringValue("Virtual Machines reside on several Data Centers. Make sure the exported Virtual Machines reside on the same Data Center.") String vmsResideOnSeveralDCsMakeSureTheExportedVMResideOnSameDcMsg(); @@ -873,12 +819,6 @@ @DefaultStringValue("Invalid MAC address") String invalidMacAddressMsg(); - @DefaultStringValue("Role(s):") - String rolesMsg(); - - @DefaultStringValue("System Permission(s):") - String systemPermissionsMsg(); - @DefaultStringValue("Note: Local Storage is already configured for this Host. The Host belongs to") String noteLocalStorageAlreadyConfiguredForThisHostMsg(); @@ -893,9 +833,6 @@ @DefaultStringValue("No new devices were found. This may be due to either: incorrect multipath configuration on the Host or wrong address of the iscsi target or a failure to authenticate on the target device. Please consult your Storage Administrator.") String noNewDevicesWereFoundMsg(); - - @DefaultStringValue("Tag(s)") - String tagsMsg(); @DefaultStringValue("No active Storage Domain is available - check Storage Domains and Hosts status.") String noStorageDomainAvailableMsg(); @@ -932,9 +869,6 @@ @DefaultStringValue("Import of a VM with the clone option must be with collapse snapshot") String importCloneVMMustCollapseSnapshots(); - - @DefaultStringValue("Template Disk(s)") - String templateDisksMsg(); @DefaultStringValue("OS Version -") String osVersionAbout(); @@ -1554,9 +1488,6 @@ @DefaultStringValue("Remove Volume") String removeVolumesTitle(); - @DefaultStringValue("Volume(s)?") - String removeVolumesMessage(); - @DefaultStringValue("NOTE:\n -Removing volume will erase all information about the volume.") String removeVolumesWarning(); @@ -1993,9 +1924,6 @@ @DefaultStringValue("Remove Provider(s)") String removeProviderTitle(); - @DefaultStringValue("Provider(s)") - String providersMsg(); - @DefaultStringValue("Change Provider URL") String providerUrlWarningTitle(); @@ -2068,9 +1996,6 @@ @DefaultStringValue("Remove Cluster Policy") String removeClusterPolicyTitle(); - - @DefaultStringValue("Cluster Policy(ies):") - String removeClusterPolicyMessage(); @DefaultStringValue("Ballooning is only available for Cluster compatibility version 3.3 and higher") String ballooningNotAvailable(); -- To view, visit http://gerrit.ovirt.org/20471 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7411dec0eaf8d60cefff563988618f7c548eecce 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
