Alexander Wels has uploaded a new change for review. Change subject: userportal,webadmin: Replace UIConstants.empty() ......................................................................
userportal,webadmin: Replace UIConstants.empty() - Replaced UIConstants.empty() with "", instead of having a localized version of 'empty' which makes no sense and can in fact cause issues if the translation is not in fact empty. Change-Id: I17fac230cd19dd3513df06de355171430a823257 Signed-off-by: Alexander Wels <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 4 files changed, 12 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/35894/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java index cacd155..2250b76 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java @@ -942,11 +942,11 @@ // TODO: remove setIsChangable when configured ssh username is enabled getUserName().setIsChangable(false); setFetchSshFingerprint(new EntityModel<String>()); - getFetchSshFingerprint().setEntity(constants.empty()); + getFetchSshFingerprint().setEntity(""); setUserPassword(new EntityModel<String>()); - getUserPassword().setEntity(constants.empty()); + getUserPassword().setEntity(""); setPublicKey(new EntityModel<String>()); - getPublicKey().setEntity(constants.empty()); + getPublicKey().setEntity(""); setDataCenter(new ListModel<StoragePool>()); getDataCenter().getSelectedItemChangedEvent().addListener(this); getDataCenter().setIsAvailable(ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly); @@ -1116,8 +1116,8 @@ private void fetchSSHFingerprint() { // Cleaning up fields for initialization - getFetchSshFingerprint().setEntity(ConstantsManager.getInstance().getConstants().empty()); - getFetchResult().setEntity(ConstantsManager.getInstance().getConstants().empty()); + getFetchSshFingerprint().setEntity(""); + getFetchResult().setEntity(""); AsyncQuery aQuery = new AsyncQuery(); aQuery.setModel(this); @@ -1852,12 +1852,12 @@ } public void cleanHostParametersFields() { - getName().setEntity(constants.empty()); - getComment().setEntity(constants.empty()); + getName().setEntity(""); + getComment().setEntity(""); getAuthSshPort().setEntity(Integer.parseInt(constants.defaultHostSSHPort())); - getHost().setEntity(constants.empty()); - getUserPassword().setEntity(constants.empty()); - getFetchSshFingerprint().setEntity(constants.empty()); + getHost().setEntity(""); + getUserPassword().setEntity(""); + getFetchSshFingerprint().setEntity(""); } protected abstract boolean showInstallationProperties(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java index 5b02d6b..6d5aea3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java @@ -156,7 +156,7 @@ // TODO: remove setIsChangable when configured ssh username is enabled getUserName().setIsChangable(false); setPublicKey(new EntityModel<String>()); - getPublicKey().setEntity(constants.empty()); + getPublicKey().setEntity(""); setValidationFailed(new EntityModel<Boolean>()); fetchPublicKey(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java index 7e91d2c..60c2b6d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java @@ -577,6 +577,6 @@ } public String getLoginButtonLabel() { - return ConstantsManager.getInstance().getConstants().empty(); + return ""; } } 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 906c11e..d15cfbe 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 @@ -39,10 +39,6 @@ @DefaultStringValue("Hide Advanced Options") String hideAdvancedOptions(); - // Titles - @DefaultStringValue("") - String empty(); - @DefaultStringValue(" ") String space(); -- To view, visit http://gerrit.ovirt.org/35894 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17fac230cd19dd3513df06de355171430a823257 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
