Vered Volansky has uploaded a new change for review. Change subject: core: cleanup: Conventional method naming ......................................................................
core: cleanup: Conventional method naming Changed getimageStatus and setimageStatus according to java's conventions in DiskImage. Change-Id: I00ed0695c6601aeaa70c4e10279c87989f44182b Signed-off-by: Vered Volansky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskImageStatusColumn.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskStatusColumn.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java 39 files changed, 63 insertions(+), 63 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/11832/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java index a299ffc..bbabf93 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java @@ -53,7 +53,7 @@ mNewCreatedDiskImage.setcreation_date(new Date()); mNewCreatedDiskImage.setlastModified(new Date()); mNewCreatedDiskImage.setactive(true); - mNewCreatedDiskImage.setimageStatus(ImageStatus.LOCKED); + mNewCreatedDiskImage.setImageStatus(ImageStatus.LOCKED); mNewCreatedDiskImage.setvm_snapshot_id(getParameters().getVmSnapshotId()); mNewCreatedDiskImage.setQuotaId(getParameters().getQuotaId()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java index 8fa8e1c..7f8c42f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java @@ -118,7 +118,7 @@ // For illegal image check if it was snapshot as illegal (therefore // still exists at DB, or was it erased after snapshot - therefore the // query returned to UI an illegal image) - if (diskImage.getimageStatus() == ImageStatus.ILLEGAL) { + if (diskImage.getImageStatus() == ImageStatus.ILLEGAL) { DiskImage snapshotImageInDb = getDiskImageDao().getSnapshotById(diskImage.getImageId()); if (snapshotImageInDb == null) { @@ -315,7 +315,7 @@ // of images on a given storage domain int result = 0; for (DiskImage img : getDiskImagesFromConfiguration()) { - if (img.getimageStatus() != ImageStatus.ILLEGAL) { + if (img.getImageStatus() != ImageStatus.ILLEGAL) { if (img.getstorage_ids().get(0).getValue().equals(storageDomainId)) { result = result + (int) Math.ceil(img.getActualSize()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java index 857362d..c057bfc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java @@ -57,14 +57,14 @@ return false; } boolean isImageDisk = disk.getDiskStorageType() == DiskStorageType.IMAGE; - if (isImageDisk && ((DiskImage) disk).getimageStatus() == ImageStatus.ILLEGAL) { + if (isImageDisk && ((DiskImage) disk).getImageStatus() == ImageStatus.ILLEGAL) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_ILLEGAL_DISK_OPERATION); return false; } retValue = acquireLockInternal(); - if (retValue && isImageDisk && ((DiskImage) disk).getimageStatus() == ImageStatus.LOCKED) { + if (retValue && isImageDisk && ((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_LOCKED); addCanDoActionMessage(String.format("$%1$s %2$s", "diskAliases", disk.getDiskAlias())); return false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java index cde53ae..4891254 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java @@ -172,8 +172,8 @@ new GetImageInfoVDSCommandParameters(storagePoolId, storageDomainId, imageGroupId, getImage().getImageId())).getReturnValue(); - if (image.getimageStatus() != ImageStatus.OK) { - diskImage.setimageStatus(image.getimageStatus()); + if (image.getImageStatus() != ImageStatus.OK) { + diskImage.setImageStatus(image.getImageStatus()); getImageDao().update(diskImage.getImage()); throw new VdcBLLException(VdcBllErrors.IRS_IMAGE_STATUS_ILLEGAL); } @@ -338,7 +338,7 @@ TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @Override public Void runInTransaction() { - getCompensationContext().snapshotEntityStatus(diskImage.getImage(), diskImage.getimageStatus()); + getCompensationContext().snapshotEntityStatus(diskImage.getImage(), diskImage.getImageStatus()); getCompensationContext().stateChanged(); setImageStatus(ImageStatus.LOCKED); return null; @@ -351,7 +351,7 @@ protected void setImageStatus(ImageStatus imageStatus) { DiskImage diskImage = getRelevantDiskImage(); - diskImage.setimageStatus(imageStatus); + diskImage.setImageStatus(imageStatus); ImagesHandler.updateImageStatus(diskImage.getImage().getId(), imageStatus); } @@ -381,7 +381,7 @@ } // Unlock destination image: - getDestinationDiskImage().setimageStatus(ImageStatus.OK); + getDestinationDiskImage().setImageStatus(ImageStatus.OK); getImageDao().update(getDestinationDiskImage().getImage()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java index 4ebb466..5dd4949 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java @@ -98,7 +98,7 @@ log.debugFormat("Image {0} of Disk {1} cannot be found in database. This image will be returned as ILLEGAL from the query", fromConfigImg.getImageId(), fromConfigImg.getId()); - fromConfigImg.setimageStatus(ImageStatus.ILLEGAL); + fromConfigImg.setImageStatus(ImageStatus.ILLEGAL); } } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java index 37bb1f4..a0e3250 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java @@ -481,7 +481,7 @@ boolean returnValue = true; List<String> lockedDisksAliases = new ArrayList<String>(); for (DiskImage diskImage : images) { - if (diskImage.getimageStatus() == ImageStatus.LOCKED) { + if (diskImage.getImageStatus() == ImageStatus.LOCKED) { lockedDisksAliases.add(diskImage.getDiskAlias()); returnValue = false; } @@ -595,8 +595,8 @@ for (DiskImage diskImage : images) { if (diskImage != null) { DiskImage image = irsImages.get(i++); - if (image.getimageStatus() != ImageStatus.OK) { - diskImage.setimageStatus(image.getimageStatus()); + if (image.getImageStatus() != ImageStatus.OK) { + diskImage.setImageStatus(image.getImageStatus()); DbFacade.getInstance().getImageDao().update(diskImage.getImage()); returnValue = false; ListUtils.nullSafeAdd(messages, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java index 0745e2b..1c8fc48 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java @@ -101,7 +101,7 @@ protected boolean isImageNotLocked() { DiskImage diskImage = getImage(); - if (diskImage.getimageStatus() == ImageStatus.LOCKED) { + if (diskImage.getImageStatus() == ImageStatus.LOCKED) { if (getParameters().getOperation() == ImageOperation.Move) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_LOCKED); addCanDoActionMessage(String.format("$%1$s %2$s", "diskAliases", diskImage.getDiskAlias())); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java index bdc6822..5078a84 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java @@ -257,7 +257,7 @@ */ protected boolean verifyDisksNotLocked(List<DiskImage> disks) { for (DiskImage disk : disks) { - if (disk.getimageStatus() == ImageStatus.LOCKED) { + if (disk.getImageStatus() == ImageStatus.LOCKED) { return false; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java index 8d5a4b6..52fcb31 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java @@ -104,7 +104,7 @@ getDbFacade().getDiskImageDao().getAllSnapshotsForImageGroup(diskImage.getId()); for (DiskImage diskSnapshot : snapshotDisks) { diskSnapshot.setvm_snapshot_id(null); - diskSnapshot.setimageStatus(ImageStatus.ILLEGAL); + diskSnapshot.setImageStatus(ImageStatus.ILLEGAL); getDbFacade().getImageDao().update(diskSnapshot.getImage()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java index 335cf5f..161b18e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java @@ -133,7 +133,7 @@ retValue && validate(validator.isDomainExistAndActive()) && validate(validator.domainIsValidDestination()); - if (retValue && diskImage.getimageStatus() == ImageStatus.LOCKED) { + if (retValue && diskImage.getImageStatus() == ImageStatus.LOCKED) { retValue = false; addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_OBJECT_LOCKED); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java index baa68d8..6ca8909 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java @@ -289,7 +289,7 @@ if (isShouldBeLocked) { // the image status should be set to ILLEGAL, so that in case compensation runs the image status will // be revert to be ILLEGAL, as we can't tell whether the task started on vdsm side or not. - getDiskImage().setimageStatus(ImageStatus.ILLEGAL); + getDiskImage().setImageStatus(ImageStatus.ILLEGAL); lockImageWithCompensation(); } // Releasing the lock for cases it was set by the parent command. The lock can be released because the image diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java index a925ff2..85afc2d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java @@ -300,7 +300,7 @@ // If the VM still has disk images related to it, change their status to Illegal. if (!diskImages.isEmpty()) { for (DiskImage diskImage : diskImages) { - if (diskImage.getimageStatus() != ImageStatus.ILLEGAL) { + if (diskImage.getImageStatus() != ImageStatus.ILLEGAL) { log.errorFormat("Disk {0} which is part of VM {1} was not at ILLEGAL state.", diskImage.getDiskAlias(), getVm().getVmName()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java index cdbf1bf..1475efa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java @@ -97,7 +97,7 @@ boolean succeeded = true; for (DiskImage image : getImagesList()) { - if (image.getimageStatus() != ImageStatus.ILLEGAL) { + if (image.getImageStatus() != ImageStatus.ILLEGAL) { ImagesContainterParametersBase params = new RestoreFromSnapshotParameters(image.getImageId(), getVmId(), targetSnapshot, removedSnapshotId); VdcReturnValueBase returnValue = runAsyncTask(VdcActionType.RestoreFromSnapshot, params); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java index f38a505..baf6ea7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java @@ -102,7 +102,7 @@ } else { if (vmtImages != null) { for (DiskImage image : vmtImages) { - if (image.getimageStatus() == ImageStatus.LOCKED) { + if (image.getImageStatus() == ImageStatus.LOCKED) { returnValue = false; break; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java index 8da889e..12b7a19 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java @@ -209,7 +209,7 @@ */ public void removeAllIllegalDisks(Guid snapshotId, Guid vmId) { for (DiskImage diskImage : getDiskImageDao().getAllSnapshotsForVmSnapshot(snapshotId)) { - if (diskImage.getimageStatus() == ImageStatus.ILLEGAL) { + if (diskImage.getImageStatus() == ImageStatus.ILLEGAL) { ImagesHandler.removeDiskImage(diskImage, vmId); } } @@ -378,7 +378,7 @@ } else { // If can't find the image, insert it as illegal so that it can't be used and make the device unplugged. if (getDiskImageDao().getSnapshotById(diskImage.getImageId()) == null) { - diskImage.setimageStatus(ImageStatus.ILLEGAL); + diskImage.setImageStatus(ImageStatus.ILLEGAL); diskImage.setvm_snapshot_id(activeSnapshotId); ImagesHandler.addImage(diskImage, true, (diskImage.getstorage_ids() == null) ? null : diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQueryTest.java index 2f9f309..1647584 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQueryTest.java @@ -129,7 +129,7 @@ assertNotNull("Return value from query cannot be null", returnValue); VM vm = (VM) returnValue.getReturnValue(); for (Disk diskImage : vm.getDiskMap().values()) { - assertEquals(((DiskImage)diskImage).getimageStatus(), ImageStatus.ILLEGAL); + assertEquals(((DiskImage)diskImage).getImageStatus(), ImageStatus.ILLEGAL); } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java index fe7bee1..d608ace 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java @@ -148,7 +148,7 @@ initializeCommand(ImageOperation.Move); initVmDiskImage(); initVm(); - command.getImage().setimageStatus(ImageStatus.LOCKED); + command.getImage().setImageStatus(ImageStatus.LOCKED); doReturn(vmDeviceDao).when(command).getVmDeviceDAO(); assertFalse(command.canDoAction()); assertTrue(command.getReturnValue().getCanDoActionMessages().contains( @@ -159,7 +159,7 @@ public void canDoActionTemplateImageIsLocked() throws Exception { initializeCommand(ImageOperation.Copy); initTemplateDiskImage(); - command.getImage().setimageStatus(ImageStatus.LOCKED); + command.getImage().setImageStatus(ImageStatus.LOCKED); doReturn(vmTemplateDao).when(command).getVmTemplateDAO(); Map<Boolean, VmTemplate> map = Collections.singletonMap(true, new VmTemplate()); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java index 275ec1d..715ca67 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java @@ -319,7 +319,7 @@ private DiskImage createDiskImage(ImageStatus status) { DiskImage disk = new DiskImage(); disk.setId(Guid.NewGuid()); - disk.setimageStatus(status); + disk.setImageStatus(status); return disk; } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java index 2579ecd..2d7ed82 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveImageCommandTest.java @@ -124,7 +124,7 @@ disk.setstorage_pool_id(vm.getStoragePoolId()); disk.setactive(Boolean.TRUE); disk.setvm_snapshot_id(snapshotId); - disk.setimageStatus(ImageStatus.OK); + disk.setImageStatus(ImageStatus.OK); disk.setappList(""); disk.setdescription(""); vm.getDiskList().add(disk); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java index 2a1d054..f3ef374 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java @@ -84,7 +84,7 @@ setit_guid(it_guid); this.setsize(size); this.setParentId(parentId); - this.setimageStatus(imageStatus); + this.setImageStatus(imageStatus); this.setlastModified(lastModified); this.setappList(appList); this.setVmEntityType(vmEntityType); @@ -228,11 +228,11 @@ getImage().setParentId(value); } - public ImageStatus getimageStatus() { + public ImageStatus getImageStatus() { return getImage().getStatus(); } - public void setimageStatus(ImageStatus value) { + public void setImageStatus(ImageStatus value) { getImage().setStatus(value); } @@ -379,7 +379,7 @@ di.appList = diskImage.appList; di.setit_guid(new Guid(diskImage.getit_guid().getUuid())); di.setParentId(new Guid(diskImage.getParentId().getUuid())); - di.setimageStatus(diskImage.getimageStatus()); + di.setImageStatus(diskImage.getImageStatus()); di.setlastModified(new Date(diskImage.getlastModified().getTime())); di.storageIds = new ArrayList<Guid>(diskImage.storageIds); di.setvm_snapshot_id(diskImage.getvm_snapshot_id()); @@ -403,7 +403,7 @@ di.setcreation_date(new Date()); di.setlastModified(new Date()); di.setactive(true); - di.setimageStatus(ImageStatus.LOCKED); + di.setImageStatus(ImageStatus.LOCKED); return di; } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java index e475cef..8b9ce44 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java @@ -138,7 +138,7 @@ entity.setsize(rs.getLong("size")); entity.setParentId(Guid.createGuidFromString(rs .getString("ParentId"))); - entity.setimageStatus(ImageStatus.forValue(rs + entity.setImageStatus(ImageStatus.forValue(rs .getInt("imageStatus"))); entity.setlastModified(DbFacadeUtils.fromDate(rs .getTimestamp("lastModified"))); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java index 1fd1fa3..11900ab 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java @@ -99,7 +99,7 @@ expect(entity.getvm_snapshot_id()).andReturn(GUIDS[2]).anyTimes(); expect(entity.getvolume_format()).andReturn(VolumeFormat.RAW).anyTimes(); expect(entity.getDiskInterface()).andReturn(DiskInterface.VirtIO).anyTimes(); - expect(entity.getimageStatus()).andReturn(ImageStatus.OK).anyTimes(); + expect(entity.getImageStatus()).andReturn(ImageStatus.OK).anyTimes(); expect(entity.getvolume_type()).andReturn(VolumeType.Sparse).anyTimes(); expect(entity.isBoot()).andReturn(false).anyTimes(); expect(entity.isShareable()).andReturn(false).anyTimes(); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java index 1bc2819..59686f9 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java @@ -44,7 +44,7 @@ entity.setId(GUIDS[index]); entity.setvolume_format(VolumeFormat.RAW); entity.setDiskInterface(DiskInterface.VirtIO); - entity.setimageStatus(ImageStatus.OK); + entity.setImageStatus(ImageStatus.OK); entity.setvolume_type(VolumeType.Sparse); entity.setBoot(false); entity.setShareable(false); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java index d1a29e0..1da0c62 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java @@ -43,7 +43,7 @@ entity.setId(GUIDS[index]); entity.setvolume_format(VolumeFormat.RAW); entity.setDiskInterface(DiskInterface.VirtIO); - entity.setimageStatus(ImageStatus.OK); + entity.setImageStatus(ImageStatus.OK); entity.setvolume_type(VolumeType.Sparse); entity.setBoot(false); entity.setShareable(false); diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java index 158ea91..2d2bc72 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java @@ -101,7 +101,7 @@ } } if (disk.isSetStatus()) { - diskImage.setimageStatus(map(DiskStatus.fromValue(disk.getStatus().getState()))); + diskImage.setImageStatus(map(DiskStatus.fromValue(disk.getStatus().getState()))); } if (disk.isSetSparse()) { diskImage.setvolume_type(disk.isSparse() ? VolumeType.Sparse : VolumeType.Preallocated); @@ -152,8 +152,8 @@ if (entity.getvolume_format() != null) { model.setFormat(map(entity.getvolume_format(), null)); } - if (entity.getimageStatus() != null) { - DiskStatus status = map(entity.getimageStatus()); + if (entity.getImageStatus() != null) { + DiskStatus status = map(entity.getImageStatus()); model.setStatus(StatusUtils.create(status == null ? null : status.value())); } model.setSparse(VolumeType.Sparse == entity.getvolume_type()); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java index 82e4972..b4ab6c2 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java @@ -488,7 +488,7 @@ image.setId(OvfParser.GetImageGrupIdFromImageFile(node.Attributes.get("ovf:href").getValue())); // Default values: image.setactive(true); - image.setimageStatus(ImageStatus.OK); + image.setImageStatus(ImageStatus.OK); image.setdescription(node.Attributes.get("ovf:description").getValue()); _images.add(image); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java index 3e2ebbc..38dc38c 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java @@ -81,7 +81,7 @@ newImage.setParentId(new Guid((String) xmlRpcStruct.getItem(IrsProperties.parent))); newImage.setdescription((String) xmlRpcStruct.getItem(IrsProperties.description)); - newImage.setimageStatus(EnumUtils.valueOf(ImageStatus.class, + newImage.setImageStatus(EnumUtils.valueOf(ImageStatus.class, (String) xmlRpcStruct.getItem(IrsProperties.ImageStatus), true)); if (xmlRpcStruct.contains(IrsProperties.size)) { newImage.setsize(Long.parseLong(xmlRpcStruct.getItem(IrsProperties.size).toString()) * 512); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskImageStatusColumn.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskImageStatusColumn.java index 1e95cdf..7ab6a25 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskImageStatusColumn.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskImageStatusColumn.java @@ -8,9 +8,9 @@ @Override public ImageResource getValue(DiskImage diskImage) { - setEnumTitle(diskImage.getimageStatus()); + setEnumTitle(diskImage.getImageStatus()); - switch (diskImage.getimageStatus()) { + switch (diskImage.getImageStatus()) { case OK: return getCommonResources().upImage(); case LOCKED: diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskStatusColumn.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskStatusColumn.java index 358b713..6cb015a 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskStatusColumn.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/DiskStatusColumn.java @@ -13,8 +13,8 @@ if (disk.getDiskStorageType().equals(DiskStorageType.IMAGE)) { DiskImage diskImage = (DiskImage) disk; - if (diskImage.getimageStatus().equals(ImageStatus.LOCKED)) { - setEnumTitle(diskImage.getimageStatus()); + if (diskImage.getImageStatus().equals(ImageStatus.LOCKED)) { + setEnumTitle(diskImage.getImageStatus()); return new DiskImageStatusColumn().getValue(diskImage); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java index 1130ea6..583fe8d 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java @@ -157,7 +157,7 @@ @Override protected ImageStatus getRawValue(Disk object) { return object.getDiskStorageType() == DiskStorageType.IMAGE ? - ((DiskImage) object).getimageStatus() : null; + ((DiskImage) object).getImageStatus() : null; } }; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java index af81b2f..1238578 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java @@ -1006,7 +1006,7 @@ for (DiskModel diskModel : disks) { Disk disk = diskModel.getDisk(); if (disk.getDiskStorageType() == DiskStorageType.IMAGE && - ((DiskImage) disk).getimageStatus() == status) { + ((DiskImage) disk).getImageStatus() == status) { disksAliases.add(disk.getDiskAlias()); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java index 5f210e1..577c9bb 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java @@ -161,7 +161,7 @@ TextColumnWithTooltip<DiskImage> statusColumn = new EnumColumn<DiskImage, ImageStatus>() { @Override protected ImageStatus getRawValue(DiskImage object) { - return object.getimageStatus(); + return object.getImageStatus(); } }; disksTable.addColumn(statusColumn, constants.statusDisk(), "60px"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java index 48f0548..028ffc7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java @@ -625,7 +625,7 @@ Disk disk = (Disk) getSelectedItem(); ArrayList<Disk> disks = getSelectedItems() != null ? (ArrayList<Disk>) getSelectedItems() : null; boolean isDiskLocked = disk != null && disk.getDiskStorageType() == DiskStorageType.IMAGE && - ((DiskImage) disk).getimageStatus() == ImageStatus.LOCKED; + ((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED; getNewCommand().setIsExecutionAllowed(true); getEditCommand().setIsExecutionAllowed(disk != null && disks != null && disks.size() == 1 && !isDiskLocked); @@ -671,7 +671,7 @@ DiskImage diskImage = (DiskImage) disk; if (disk.getDiskStorageType() != DiskStorageType.IMAGE || - diskImage.getimageStatus() != ImageStatus.OK || + diskImage.getImageStatus() != ImageStatus.OK || disk.getVmEntityType() == VmEntityType.TEMPLATE || !datacenterId.equals(diskImage.getstorage_pool_id())) { @@ -696,7 +696,7 @@ for (Disk disk : disks) { DiskImage diskImage = (DiskImage) disk; - if (diskImage.getimageStatus() != ImageStatus.OK || disk.getVmEntityType() != VmEntityType.TEMPLATE || + if (diskImage.getImageStatus() != ImageStatus.OK || disk.getVmEntityType() != VmEntityType.TEMPLATE || !datacenterId.equals(diskImage.getstorage_pool_id())) { return false; @@ -714,7 +714,7 @@ { boolean isTemplateDisk = disk.getVmEntityType() == VmEntityType.TEMPLATE; boolean isImageLocked = disk.getDiskStorageType() == DiskStorageType.IMAGE - && ((DiskImage) disk).getimageStatus() == ImageStatus.LOCKED; + && ((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED; if (isTemplateDisk || isImageLocked) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java index cf4657d..13240c9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java @@ -120,7 +120,7 @@ private boolean isRemoveCommandAvailable(ArrayList<DiskImage> disks) { for (DiskImage disk : disks) { - boolean isImageLocked = disk.getimageStatus() == ImageStatus.LOCKED; + boolean isImageLocked = disk.getImageStatus() == ImageStatus.LOCKED; if (isImageLocked) { return false; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java index 4df63e8..ed8b92a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java @@ -237,7 +237,7 @@ for (DiskImage disk : disks) { - if (disk.getimageStatus() != ImageStatus.OK) + if (disk.getImageStatus() != ImageStatus.OK) { return false; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java index 6936d76..b2beb55 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java @@ -261,7 +261,7 @@ for (DiskModel disk : disks) { - if (((DiskImage) disk.getDisk()).getimageStatus() == ImageStatus.LOCKED + if (((DiskImage) disk.getDisk()).getImageStatus() == ImageStatus.LOCKED || ((DiskImage) disk.getDisk()).getstorage_ids().size() == 1) { return false; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java index d0d64b4..05dc26f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java @@ -905,7 +905,7 @@ VM vm = getEntity(); Disk disk = (Disk) getSelectedItem(); boolean isDiskLocked = disk != null && disk.getDiskStorageType() == DiskStorageType.IMAGE && - ((DiskImage) disk).getimageStatus() == ImageStatus.LOCKED; + ((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED; getNewCommand().setIsExecutionAllowed(true); @@ -968,7 +968,7 @@ { boolean isLocked = disk.getDiskStorageType() == DiskStorageType.IMAGE - && ((DiskImage) disk).getimageStatus() == ImageStatus.LOCKED; + && ((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED; if (disk.getPlugged() == plug || isLocked || (disk.getDiskInterface() == DiskInterface.IDE && !isVmDown())) { @@ -981,7 +981,7 @@ private boolean isImageDiskOK(Disk disk) { return disk.getDiskStorageType() == DiskStorageType.IMAGE && - ((DiskImage) disk).getimageStatus() == ImageStatus.OK; + ((DiskImage) disk).getImageStatus() == ImageStatus.OK; } private boolean isMoveCommandAvailable() { @@ -1026,7 +1026,7 @@ for (Disk disk : disks) { if (disk.getDiskStorageType() == DiskStorageType.IMAGE && - ((DiskImage) disk).getimageStatus() == ImageStatus.LOCKED || (!isVmDown() && disk.getPlugged())) + ((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED || (!isVmDown() && disk.getPlugged())) { return false; } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java index 9c59604..5d8bdb1 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java @@ -52,7 +52,7 @@ addTextBoxToPanel(panel, new TextBoxLabel(), disk.getDiskAlias(), ""); //$NON-NLS-1$ addValueLabelToPanel(panel, new DiskSizeLabel<Long>(), disk.getSizeInGigabytes(), "120px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new DiskSizeLabel<Long>(DiskSizeUnit.BYTE), disk.getactual_size(), "120px"); //$NON-NLS-1$ - addValueLabelToPanel(panel, new EnumLabel<ImageStatus>(), disk.getimageStatus(), "120px"); //$NON-NLS-1$ + addValueLabelToPanel(panel, new EnumLabel<ImageStatus>(), disk.getImageStatus(), "120px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new EnumLabel<VolumeType>(), disk.getvolume_type(), "120px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new EnumLabel<DiskInterface>(), disk.getDiskInterface(), "120px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new DateLabel(), disk.getcreation_date(), "90px"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java index 8697b4a..f57ff73 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/StoragesTree.java @@ -75,7 +75,7 @@ addItemToPanel(panel, new Image(resources.diskImage()), "25px"); //$NON-NLS-1$ addTextBoxToPanel(panel, new TextBoxLabel(), disk.getDiskAlias(), ""); //$NON-NLS-1$ addValueLabelToPanel(panel, new DiskSizeLabel<Long>(), disk.getSizeInGigabytes(), "120px"); //$NON-NLS-1$ - addValueLabelToPanel(panel, new EnumLabel<ImageStatus>(), disk.getimageStatus(), "120px"); //$NON-NLS-1$ + addValueLabelToPanel(panel, new EnumLabel<ImageStatus>(), disk.getImageStatus(), "120px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new EnumLabel<VolumeType>(), disk.getvolume_type(), "120px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new EnumLabel<DiskInterface>(), disk.getDiskInterface(), "110px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new DateLabel(), disk.getcreation_date(), "90px"); //$NON-NLS-1$ -- To view, visit http://gerrit.ovirt.org/11832 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00ed0695c6601aeaa70c4e10279c87989f44182b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
