Alona Kaplan has submitted this change and it was merged. Change subject: core: nesting PluralMessages into NetworkValidator ...................................................................... core: nesting PluralMessages into NetworkValidator PluralMessages was intended to help with singular-plural localization pairs. This is bad approach, but I thought it should help with transition. But when variable replacements hit this class it becomes really unreadable and complexity overcame the benefits. This class was also used from NetworkAttachmentValidator, but that one can delegate to NetworkValidator, so PluralMessages was simplified a lot, uses newly available methods, and is made accessible only to NetworkValidator. Change-Id: I6c88ed8f66ace2c515d1174cf305204074f432ce Signed-off-by: Martin Mucha <mmucha@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DetachNetworkFromClusterInternalCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/PluralMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 6 files changed, 81 insertions(+), 93 deletions(-) Approvals: Martin Mucha: Verified Alona Kaplan: Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/45648 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c88ed8f66ace2c515d1174cf305204074f432ce Gerrit-PatchSet: 8 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <mmucha@redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Mucha <mmucha@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>