Arik Hadas has uploaded a new change for review. Change subject: frontend: move string messages to Messages class ......................................................................
frontend: move string messages to Messages class Move strings which are messages that are shown to the user from UserPortalListModel and VmListModel classes to Messages class. Change-Id: Ib35aff5e2238f109bf9beba5d7d198c9cb52ba59 Signed-off-by: Arik Hadas <[email protected]> --- 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/vms/VmListModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java 3 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/13206/1 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 0cf56da..1ff1083 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 @@ -818,7 +818,7 @@ ((RunOnceModel) userPortalListModel.getWindow()).getBootSequence(); bootSequenceModel.getNetworkOption().setIsChangable(false); bootSequenceModel.getNetworkOption() - .setChangeProhibitionReason("Virtual Machine must have at least one network interface defined to boot from network."); //$NON-NLS-1$ + .setChangeProhibitionReason(ConstantsManager.getInstance().getMessages().interfaceIsRequiredToBootFromNetwork()); } } }; @@ -840,7 +840,8 @@ if (vmDisks.isEmpty()) { runOnceModel.getRunAsStateless().setIsChangable(false); - runOnceModel.getRunAsStateless().setChangeProhibitionReason("Diskless Virtual Machine cannot run in stateless mode"); //$NON-NLS-1$ + runOnceModel.getRunAsStateless() + .setChangeProhibitionReason(ConstantsManager.getInstance().getMessages().disklessVmCannotRunAsStateless()); runOnceModel.getRunAsStateless().setEntity(false); } @@ -857,7 +858,7 @@ BootSequenceModel bootSequenceModel = runOnceModel.getBootSequence(); bootSequenceModel.getHardDiskOption().setIsChangable(false); bootSequenceModel.getHardDiskOption() - .setChangeProhibitionReason("Virtual Machine must have at least one bootable disk defined to boot from hard disk."); //$NON-NLS-1$ + .setChangeProhibitionReason(ConstantsManager.getInstance().getMessages().bootableDiskIsRequiredToBootFromDisk()); } } }; 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 5389958..14dc75f 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 @@ -1461,7 +1461,7 @@ { BootSequenceModel bootSequenceModel = runOnceModel.getBootSequence(); bootSequenceModel.getNetworkOption() - .setChangeProhibitionReason("Virtual Machine must have at least one network interface defined to boot from network."); //$NON-NLS-1$ + .setChangeProhibitionReason(ConstantsManager.getInstance().getMessages().interfaceIsRequiredToBootFromNetwork()); bootSequenceModel.getNetworkOption().setIsChangable(false); } } @@ -1484,7 +1484,8 @@ if (vmDisks.isEmpty()) { runOnceModel.getRunAsStateless().setIsChangable(false); - runOnceModel.getRunAsStateless().setChangeProhibitionReason("Diskless Virtual Machine cannot run in stateless mode"); //$NON-NLS-1$ + runOnceModel.getRunAsStateless() + .setChangeProhibitionReason(ConstantsManager.getInstance().getMessages().disklessVmCannotRunAsStateless()); runOnceModel.getRunAsStateless().setEntity(false); } @@ -1501,7 +1502,7 @@ BootSequenceModel bootSequenceModel = runOnceModel.getBootSequence(); bootSequenceModel.getHardDiskOption().setIsChangable(false); bootSequenceModel.getHardDiskOption() - .setChangeProhibitionReason("Virtual Machine must have at least one bootable disk defined to boot from hard disk."); //$NON-NLS-1$ + .setChangeProhibitionReason(ConstantsManager.getInstance().getMessages().bootableDiskIsRequiredToBootFromDisk()); } } }; diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java index a5214be..49de335 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java @@ -243,6 +243,15 @@ @DefaultMessage("{0} (from Storage Domain {1})") String templateDiskDescription(String diskAlias, String storageDomainName); + @DefaultMessage("Virtual Machine must have at least one network interface defined to boot from network.") + String interfaceIsRequiredToBootFromNetwork(); + + @DefaultMessage("Virtual Machine must have at least one bootable disk defined to boot from hard disk.") + String bootableDiskIsRequiredToBootFromDisk(); + + @DefaultMessage("Diskless Virtual Machine cannot run in stateless mode") + String disklessVmCannotRunAsStateless(); + // Vnic @DefaultMessage("Hot Plug is not supported on cluster version {0}") String hotPlugNotSupported(String clusterVersion); -- To view, visit http://gerrit.ovirt.org/13206 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib35aff5e2238f109bf9beba5d7d198c9cb52ba59 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
