Greg Sheremeta has uploaded a new change for review. Change subject: webadmin: cleaned up setChangeProhibitionReason calls ......................................................................
webadmin: cleaned up setChangeProhibitionReason calls Cleaned up all setChangeProhibitionReason calls to use non-hardcoded strings. Fixed some spelling mistakes in some of the calls. Change-Id: I8002e0aa88c892475c74d264a72e0ec30fe2b7d6 Bug-Url: https://bugzilla.redhat.com/995754 Signed-off-by: Greg Sheremeta <[email protected]> --- 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/hosts/EditHostModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.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 5 files changed, 29 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/18218/1 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 1ce5fda..58cd948 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 @@ -321,8 +321,8 @@ List<StorageDomain> storageDomainList = (List<StorageDomain>) returnValue; if (storageDomainList.size() != 0) { - model.getStorageTypeList() - .setChangeProhibitionReason("Cannot change Repository type with Storage Domains attached to it"); //$NON-NLS-1$ + model.getStorageTypeList().setChangeProhibitionReason( + constants.cannotChangeRepositoryTypeWithSDAttached()); model.getStorageTypeList().setIsChangable(false); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/EditHostModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/EditHostModel.java index 42c9103..41eb9e2 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/EditHostModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/EditHostModel.java @@ -7,6 +7,8 @@ import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.ui.uicommonweb.Linq; +import org.ovirt.engine.ui.uicompat.ConstantsManager; +import org.ovirt.engine.ui.uicompat.UIConstants; public class EditHostModel extends HostModel { @@ -45,9 +47,10 @@ @Override protected void setAllowChangeHostPlacementPropertiesWhenNotInMaintenance() { - getDataCenter().setChangeProhibitionReason("Data Center can be changed only when the Host is in Maintenance mode."); //$NON-NLS-1$ + UIConstants constants = ConstantsManager.getInstance().getConstants(); + getDataCenter().setChangeProhibitionReason(constants.dcCanOnlyBeChangedWhenHostInMaintMode()); getDataCenter().setIsChangable(false); - getCluster().setChangeProhibitionReason("Cluster can be changed only when the Host is in Maintenance mode."); //$NON-NLS-1$ + getCluster().setChangeProhibitionReason(constants.clusterCanOnlyBeChangedWhenHostInMaintMode()); getCluster().setIsChangable(false); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java index 5f23166..2429b68 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java @@ -22,6 +22,8 @@ import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemModel; +import org.ovirt.engine.ui.uicompat.ConstantsManager; +import org.ovirt.engine.ui.uicompat.UIConstants; @SuppressWarnings("unused") public class ExistingVmModelBehavior extends VmModelBehaviorBase @@ -209,8 +211,9 @@ if (vm.isInitialized()) { - getModel().getTimeZone() - .setChangeProhibitionReason("Time Zone cannot be change since the Virtual Machine was booted at the first time."); //$NON-NLS-1$ + UIConstants constants = ConstantsManager.getInstance().getConstants(); + getModel().getTimeZone().setChangeProhibitionReason( + constants.timeZoneCannotBeChangedAfterVMInit()); getModel().getTimeZone().setIsChangable(false); } 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 b6c5ecf..8267604 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 @@ -51,6 +51,7 @@ import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback; import org.ovirt.engine.ui.uicompat.IFrontendMultipleActionAsyncCallback; import org.ovirt.engine.ui.uicompat.ObservableCollection; +import org.ovirt.engine.ui.uicompat.UIConstants; public class VolumeListModel extends ListWithDetailsModel implements ISupportSystemTreeContext { @@ -172,6 +173,7 @@ VolumeListModel volumeListModel = (VolumeListModel) model; VolumeModel innerVolumeModel = (VolumeModel) volumeListModel.getWindow(); ArrayList<StoragePool> dataCenters = (ArrayList<StoragePool>) result; + final UIConstants constants = ConstantsManager.getInstance().getConstants(); if (volumeListModel.getSystemTreeSelectedItem() != null) { @@ -192,15 +194,13 @@ } } innerVolumeModel.getDataCenter().setIsChangable(false); - innerVolumeModel.getDataCenter().setChangeProhibitionReason(ConstantsManager.getInstance() - .getConstants() - .cannotChooseVolumesDataCenterinTreeContect()); + innerVolumeModel.getDataCenter().setChangeProhibitionReason( + constants.cannotChangeDCInTreeContext()); innerVolumeModel.getCluster().setItems(Arrays.asList(cluster)); innerVolumeModel.getCluster().setSelectedItem(cluster); innerVolumeModel.getCluster().setIsChangable(false); - innerVolumeModel.getCluster().setChangeProhibitionReason(ConstantsManager.getInstance() - .getConstants() - .cannotChooseVolumesClusterinTreeContect()); + innerVolumeModel.getCluster().setChangeProhibitionReason( + constants.cannotChangeClusterInTreeContext()); break; case Clusters: case DataCenter: @@ -210,9 +210,8 @@ .setItems(new ArrayList<StoragePool>(Arrays.asList(new StoragePool[] { selectDataCenter }))); innerVolumeModel.getDataCenter().setSelectedItem(selectDataCenter); innerVolumeModel.getDataCenter().setIsChangable(false); - innerVolumeModel.getDataCenter().setChangeProhibitionReason(ConstantsManager.getInstance() - .getConstants() - .cannotChooseVolumesDataCenterinTreeContect()); + innerVolumeModel.getDataCenter().setChangeProhibitionReason( + constants.cannotChangeDCInTreeContext()); break; default: innerVolumeModel.getDataCenter().setItems(dataCenters); 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 c5bf3d3..a91a5b9 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 @@ -1594,12 +1594,6 @@ @DefaultStringValue("Multiple bricks of a Replicate volume are present on the same server. This setup is not optimal. \nDo you still want to continue?") String addBricksToReplicateVolumeFromSameServerMsg(); - @DefaultStringValue("Cannot choose Volume's Data Center in tree context") - String cannotChooseVolumesDataCenterinTreeContect(); - - @DefaultStringValue("Cannot choose Volume's Cluster in tree context") - String cannotChooseVolumesClusterinTreeContect(); - @DefaultStringValue("Disable Gluster Hooks") String confirmDisableGlusterHooks(); @@ -2061,5 +2055,14 @@ @DefaultStringValue("Cannot change Host in tree context") String cannotChangeHostInTreeContext(); + + @DefaultStringValue("Data Center can be changed only when the Host is in Maintenance mode.") + String dcCanOnlyBeChangedWhenHostInMaintMode(); + + @DefaultStringValue("Cluster can be changed only when the Host is in Maintenance mode.") + String clusterCanOnlyBeChangedWhenHostInMaintMode(); + + @DefaultStringValue("Time Zone cannot be changed after the Virtual Machine is initialized.") + String timeZoneCannotBeChangedAfterVMInit(); } -- To view, visit http://gerrit.ovirt.org/18218 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8002e0aa88c892475c74d264a72e0ec30fe2b7d6 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
