Arik Hadas has uploaded a new change for review. Change subject: webadmin: minor refactoring ......................................................................
webadmin: minor refactoring Rename ImportVmData#proclem to 'warning'. Following patch will add a field for error which is also a problem, and we need to differentiate between errors and warnings. Change-Id: I5214c2baddaf7589e3aa901fc5533c0b7f119b23 Signed-off-by: Arik Hadas <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmData.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java 3 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/40309/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmData.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmData.java index 7b92f37..a795158 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmData.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmData.java @@ -12,7 +12,7 @@ private boolean templateExistsInSetup = true; private EntityModel<Boolean> collapseSnapshots; - private String problem; + private String warning; public ImportVmData(VM vm) { setCollapseSnapshots(new EntityModel<>(true)); @@ -73,11 +73,11 @@ return getEntity().getName(); } - public String getProblem() { - return problem; + public String getWarning() { + return warning; } - public void setProblem(String problem) { - this.problem = problem; + public void setWarning(String warning) { + this.warning = warning; } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java index 7a852bb..474f038 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java @@ -363,7 +363,7 @@ && getDiskImportData(disk.getId()) != null && (getDiskImportData(disk.getId()).getSelectedStorageDomain() .getStorageType().isBlockDomain())) { - ((ImportVmData) item).setProblem(ConstantsManager.getInstance().getConstants() + ((ImportVmData) item).setWarning(ConstantsManager.getInstance().getConstants() .importSparseDiskToBlockDeviceMustCollapseSnapshots()); ((ImportVmData) item).getCollapseSnapshots().setEntity(true); ((ImportVmData) item).getCollapseSnapshots() diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java index aae507b..976e879 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java @@ -240,12 +240,12 @@ AbstractImageResourceColumn<Object> isProblematicImportVmColumn = new AbstractImageResourceColumn<Object>() { @Override public ImageResource getValue(Object object) { - return ((ImportVmData) object).getProblem() != null ? resources.alertImage() : null; + return ((ImportVmData) object).getWarning() != null ? resources.alertImage() : null; } @Override public SafeHtml getTooltip(Object object) { - String problem = ((ImportVmData) object).getProblem(); + String problem = ((ImportVmData) object).getWarning(); return problem != null ? SafeHtmlUtils.fromSafeConstant(problem) : null; } }; -- To view, visit https://gerrit.ovirt.org/40309 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5214c2baddaf7589e3aa901fc5533c0b7f119b23 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
