Roy Golan has uploaded a new change for review. Change subject: core: [cleanup] remove getname and setname ......................................................................
core: [cleanup] remove getname and setname remove non conventional methods and use the getName and setName instead also remove @JsonIgnored annotation as the properry adheres to javaBeans convention now Change-Id: Ia82008d836b69967a3a59901db8327a84dfe14ea Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.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/UpdateVmTemplateCommand.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/ImportVmTemplateCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmTemplateHandlerTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/TemplateCandidateInfo.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfVmWriterTest.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateEventListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedTemplateView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageTemplateBackupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java 41 files changed, 54 insertions(+), 65 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/11953/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java index 7abe42b..42a8baa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java @@ -252,7 +252,7 @@ if (StringUtils.isEmpty(vm.getVmtName())) { VmTemplate t = DbFacade.getInstance().getVmTemplateDao() .get(vm.getVmtGuid()); - vm.setVmtName(t.getname()); + vm.setVmtName(t.getName()); } getVm().setVmtGuid(VmTemplateHandler.BlankVmTemplateId); String vmMeta = ovfManager.ExportVm(vm, AllVmImages); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java index b575197..429e496 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java @@ -153,7 +153,7 @@ if (duplicateTemplate != null) { addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_IMPORT_TEMPLATE_EXISTS); getReturnValue().getCanDoActionMessages().add( - String.format("$TemplateName %1$s", duplicateTemplate.getname())); + String.format("$TemplateName %1$s", duplicateTemplate.getName())); retVal = false; } else if (isVmTemplateWithSameNameExist()) { addCanDoActionMessage(VdcBllMessages.VM_CANNOT_IMPORT_TEMPLATE_NAME_EXISTS); @@ -190,7 +190,7 @@ } protected boolean isVmTemplateWithSameNameExist() { - return VmTemplateCommand.isVmTemlateWithSameNameExist(getParameters().getVmTemplate().getname()); + return VmTemplateCommand.isVmTemlateWithSameNameExist(getParameters().getVmTemplate().getName()); } private void initImportClonedTemplate() { 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 9993ec9..e6003f9 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 @@ -304,7 +304,7 @@ if (StringUtils.isEmpty(vm.getVmtName())) { if (!Guid.Empty.equals(vm.getVmtGuid())) { VmTemplate t = getVmTemplateDao().get(vm.getVmtGuid()); - vm.setVmtName(t.getname()); + vm.setVmtName(t.getName()); } else { vm.setVmtName(VmTemplateHandler.BlankVmTemplateName); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java index 19ecdfa..1841f23 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java @@ -48,7 +48,7 @@ if (mOldTemplate.getstatus() == VmTemplateStatus.Locked) { return failCanDoAction(VdcBllMessages.VM_TEMPLATE_IS_LOCKED); } - if (!StringUtils.equals(mOldTemplate.getname(), getVmTemplate().getname()) + if (!StringUtils.equals(mOldTemplate.getName(), getVmTemplate().getName()) && isVmTemlateWithSameNameExist(getVmTemplateName())) { addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_CREATE_DUPLICATE_NAME); } else { 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 969e932..9bd7344 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 @@ -173,7 +173,7 @@ if (StringUtils.isEmpty(vm.getVmtName())) { VmTemplate t = getVmTemplateDao().get(vm.getVmtGuid()); - vm.setVmtName(t.getname()); + vm.setVmtName(t.getName()); } VmDeviceUtils.setVmDevices(vm.getStaticData()); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java index ed7be5c..d6aa1c3 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java @@ -221,7 +221,7 @@ protected ImportVmTemplateParameters createParameters() { VmTemplate t = new VmTemplate(); - t.setname("testTemplate"); + t.setName("testTemplate"); final ImportVmTemplateParameters p = new ImportVmTemplateParameters(Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), t); return p; @@ -260,7 +260,7 @@ private void checkTemplateName(boolean isImportAsNewEntity, String name) { ImportVmTemplateParameters parameters = createParameters(); - parameters.getVmTemplate().setname(name); + parameters.getVmTemplate().setName(name); parameters.setImportAsNewEntity(isImportAsNewEntity); ImportVmTemplateCommand command = spy(new ImportVmTemplateCommand(parameters)); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmTemplateHandlerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmTemplateHandlerTest.java index aee67fc..aa466f5 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmTemplateHandlerTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmTemplateHandlerTest.java @@ -19,10 +19,10 @@ @Test public void testUpdateFieldsName() { VmTemplate src = new VmTemplate(); - src.setname(RandomUtils.instance().nextString(10)); + src.setName(RandomUtils.instance().nextString(10)); VmTemplate dest = new VmTemplate(); - dest.setname(RandomUtils.instance().nextString(10)); + dest.setName(RandomUtils.instance().nextString(10)); assertTrue("Update should be valid for different names", VmTemplateHandler.isUpdateValid(src, dest)); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java index f875f5b..385c9d8 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java @@ -10,7 +10,6 @@ import javax.validation.groups.Default; import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; import org.ovirt.engine.core.common.businessentities.Disk.DiskStorageType; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.config.Config; @@ -104,15 +103,6 @@ public void setchild_count(int value) { this.childCount = value; - } - - @JsonProperty - public String getname() { - return super.getName(); - } - - public void setname(String value) { - setName(value); } public VmTemplateStatus getstatus() { @@ -229,7 +219,6 @@ return getId().hashCode(); } - @JsonIgnore @Override @Size(min = 1, max = BusinessEntitiesDefinitions.VM_TEMPLATE_NAME_SIZE, message = "VALIDATION.VM_TEMPLATE.NAME.MAX", diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/TemplateCandidateInfo.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/TemplateCandidateInfo.java index e23287a..d68b3e9 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/TemplateCandidateInfo.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/TemplateCandidateInfo.java @@ -22,7 +22,7 @@ @Override public String getCandidateDisplayName() { - return getVmTemplateData().getname(); + return getVmTemplateData().getName(); } public TemplateCandidateInfo() { diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java index 1437336..15bcd3f 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java @@ -156,7 +156,7 @@ public String getVmTemplateName() { if (mVmTemplateName == null && getVmTemplate() != null) { - mVmTemplateName = getVmTemplate().getname(); + mVmTemplateName = getVmTemplate().getName(); } return mVmTemplateName; } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java index 59437b5..bf77722 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java @@ -131,7 +131,7 @@ .addValue("creation_date", template.getCreationDate()) .addValue("description", template.getDescription()) .addValue("mem_size_mb", template.getMemSizeMb()) - .addValue("name", template.getname()) + .addValue("name", template.getName()) .addValue("num_of_sockets", template.getNumOfSockets()) .addValue("cpu_per_socket", template.getCpuPerSocket()) .addValue("os", template.getOs()) @@ -213,7 +213,7 @@ entity.setId(Guid.createGuidFromString(rs.getString("vmt_guid"))); entity.setchild_count(rs.getInt("child_count")); entity.setMemSizeMb(rs.getInt("mem_size_mb")); - entity.setname(rs.getString("name")); + entity.setName(rs.getString("name")); entity.setOs(VmOsType.forValue(rs.getInt("os"))); entity.setVdsGroupId(Guid.createGuidFromString(rs.getString("vds_group_id"))); entity.setDomain(rs.getString("domain")); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java index dcc8887..986793f 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java @@ -1060,7 +1060,7 @@ final VmTemplateDAO vt = mock(VmTemplateDAO.class); final VmTemplate t = new VmTemplate(); t.setId(GUID); - t.setname(NAME); + t.setName(NAME); when(vt.get(Guid.Empty)).thenReturn(t); when(vt.get(GUID)).thenReturn(new VmTemplate()); return vt; diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java index 39a910e..e43057e 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java @@ -403,7 +403,7 @@ public void testGetEntityNameByIdAndTypeForVmTemplate() { VmTemplate vmTemplate = dbFacade.getVmTemplateDao().get(VM_TEMPLATE_ID); assertNotNull(vmTemplate); - String name = vmTemplate.getname(); + String name = vmTemplate.getName(); assertTrue(name.equals(dbFacade.getEntityNameByIdAndType(VM_TEMPLATE_ID, VdcObjectType.VmTemplate))); } diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java index 474e8ff..7a62876 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java @@ -42,7 +42,7 @@ newVmTemplate = new VmTemplate(); newVmTemplate.setId(Guid.NewGuid()); - newVmTemplate.setname("NewVmTemplate"); + newVmTemplate.setName("NewVmTemplate"); newVmTemplate.setVdsGroupId(VDS_GROUP_ID); } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java index 8018087..d95b9aa 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java @@ -43,7 +43,7 @@ if (action.isSetClone()){ params.setImportAsNewEntity(action.isClone()); if(action.isSetTemplate() && action.getTemplate().isSetName()) { - params.getVmTemplate().setname(action.getTemplate().getName()); + params.getVmTemplate().setName(action.getTemplate().getName()); } } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResourceTest.java index 932fe1d..d2d7ec5 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResourceTest.java @@ -391,7 +391,7 @@ static VmTemplate setUpEntityExpectations(VmTemplate entity, int index) { expect(entity.getId()).andReturn(GUIDS[index]).anyTimes(); expect(entity.getVdsGroupId()).andReturn(GUIDS[2]).anyTimes(); - expect(entity.getname()).andReturn(NAMES[index]).anyTimes(); + expect(entity.getName()).andReturn(NAMES[index]).anyTimes(); expect(entity.getDescription()).andReturn(DESCRIPTIONS[index]).anyTimes(); expect(entity.getNumOfCpus()).andReturn(8).anyTimes(); expect(entity.getNumOfSockets()).andReturn(2).anyTimes(); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java index e37a1f8..de71436 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java @@ -902,7 +902,7 @@ org.ovirt.engine.core.common.businessentities.VmTemplate entity, int index) { expect(entity.getId()).andReturn(GUIDS[index]).anyTimes(); expect(entity.getVdsGroupId()).andReturn(GUIDS[2]).anyTimes(); - expect(entity.getname()).andReturn(NAMES[index]).anyTimes(); + expect(entity.getName()).andReturn(NAMES[index]).anyTimes(); expect(entity.getDescription()).andReturn(DESCRIPTIONS[index]).anyTimes(); expect(entity.getNumOfCpus()).andReturn(8).anyTimes(); expect(entity.getNumOfSockets()).andReturn(2).anyTimes(); diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java index b0c41d4..f27f998 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java @@ -32,7 +32,7 @@ public static VmTemplate map(Template model, VmTemplate incoming) { VmTemplate entity = incoming != null ? incoming : new VmTemplate(); if (model.isSetName()) { - entity.setname(model.getName()); + entity.setName(model.getName()); } if (model.isSetId()) { entity.setId(new Guid(model.getId())); @@ -228,7 +228,7 @@ public static Template map(VmTemplate entity, Template incoming) { Template model = incoming != null ? incoming : new Template(); model.setId(entity.getId().toString()); - model.setName(entity.getname()); + model.setName(entity.getName()); model.setDescription(entity.getDescription()); model.setMemory((long)entity.getMemSizeMb() * BYTES_PER_MB); model.setHighAvailability(new HighAvailability()); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java index 279213c..7cf23d4 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java @@ -148,8 +148,8 @@ // General Vm XmlNode node = content.SelectSingleNode("Name"); if (node != null) { - _vmTemplate.setname(node.InnerText); - name = _vmTemplate.getname(); + _vmTemplate.setName(node.InnerText); + name = _vmTemplate.getName(); } node = content.SelectSingleNode("TemplateId"); if (node != null) { diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java index 7672b19..feafaa3 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java @@ -22,7 +22,7 @@ protected void writeGeneralData() { super.writeGeneralData(); _writer.WriteStartElement("Name"); - _writer.WriteRaw(_vmTemplate.getname()); + _writer.WriteRaw(_vmTemplate.getName()); _writer.WriteEndElement(); _writer.WriteStartElement("TemplateId"); _writer.WriteRaw(_vmTemplate.getId().toString()); diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfVmWriterTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfVmWriterTest.java index 3a3585d..36e5711 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfVmWriterTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfVmWriterTest.java @@ -127,7 +127,7 @@ private static VmTemplate createVmTemplate() { VmTemplate template = new VmTemplate(); - template.setname("test-template"); + template.setName("test-template"); template.setOrigin(OriginType.OVIRT); template.setId(new Guid()); template.setDescription("test-description"); 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 6e2c56f..1558a28 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 @@ -584,7 +584,7 @@ templateEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { @Override public String renderNullSafe(Object object) { - return ((VmTemplate) object).getname(); + return ((VmTemplate) object).getName(); } }); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java index 7b08250..de7b8db 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java @@ -369,7 +369,7 @@ obj.setAutoSuspend(instance.isAutoSuspend()); obj.setStateless(instance.isStateless()); obj.setMemSizeMb(instance.getMemSizeMb()); - obj.setname(instance.getname()); + obj.setName(instance.getName()); obj.setNiceLevel(instance.getNiceLevel()); obj.setNumOfMonitors(instance.getNumOfMonitors()); obj.setAllowConsoleReconnect(instance.isAllowConsoleReconnect()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java index 0c8379e..324027b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java @@ -109,7 +109,7 @@ @Override public int compare(VmTemplate x, VmTemplate y) { - return x.getname().compareTo(y.getname()); + return x.getName().compareTo(y.getName()); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java index d38dbfb..7fd624e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java @@ -88,7 +88,7 @@ return compareValue; } - return paramT1.getSecond().getname().compareTo(paramT2.getSecond().getname()); + return paramT1.getSecond().getName().compareTo(paramT2.getSecond().getName()); } }); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java index 2c6d965..aec659d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java @@ -75,7 +75,7 @@ for (Object a : getSelectedItems()) { VmTemplate template = (VmTemplate) a; - items.add(template.getname()); + items.add(template.getName()); } model.setItems(items); @@ -131,9 +131,9 @@ protected void setObjectName(Object object, String name, boolean isSuffix) { VmTemplate template = (VmTemplate) object; if (isSuffix) { - template.setname(template.getname() + name); + template.setName(template.getName() + name); } else { - template.setname(name); + template.setName(name); } } @@ -141,7 +141,7 @@ protected boolean validateSuffix(String suffix, EntityModel entityModel) { for (Object object : objectsInSetupMap.values()) { VmTemplate template = (VmTemplate) object; - if (!validateName(template.getname() + suffix, template, entityModel)) { + if (!validateName(template.getName() + suffix, template, entityModel)) { return false; } } @@ -223,7 +223,7 @@ } improtVmTemplateParameters.setImportAsNewEntity(true); improtVmTemplateParameters.getVmTemplate() - .setname(((VmTemplate) cloneObjectMap.get(template.getId())).getname()); + .setName(((VmTemplate) cloneObjectMap.get(template.getId())).getName()); } prms.add(improtVmTemplateParameters); @@ -251,7 +251,7 @@ { VmTemplate template = (VmTemplate) a; if (retVals.get(counter) != null && retVals.get(counter).getCanDoAction()) { - importedTemplates += template.getname() + ", "; //$NON-NLS-1$ + importedTemplates += template.getName() + ", "; //$NON-NLS-1$ toShowConfirmWindow = true; } counter++; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateEventListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateEventListModel.java index 64b99fa..3e1c606 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateEventListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateEventListModel.java @@ -44,7 +44,7 @@ } protected void preSearchCalled(VmTemplate template) { - setSearchString("Events:event_template=" + template.getname()); //$NON-NLS-1$ + setSearchString("Events:event_template=" + template.getName()); //$NON-NLS-1$ } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java index 91d5e9f..d3d9274 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java @@ -448,7 +448,7 @@ { VmTemplate template = getEntity(); - setName(template.getname()); + setName(template.getName()); setDescription(template.getDescription()); setQuotaName(template.getQuotaName() != null ? template.getQuotaName() : ""); //$NON-NLS-1$ setQuotaAvailable(template.getQuotaEnforcementType() != null diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java index 75380d8..d5dfce2 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java @@ -403,7 +403,7 @@ { if (!template.getId().equals(NGuid.Empty)) { - items.add(template.getname()); + items.add(template.getName()); } } @@ -489,7 +489,7 @@ String name = (String) model.getName().getEntity(); // Check name unicitate. - if (!isNameUnique && name.compareToIgnoreCase(template.getname()) != 0) + if (!isNameUnique && name.compareToIgnoreCase(template.getName()) != 0) { model.getName() .getInvalidityReasons() @@ -501,7 +501,7 @@ // Save changes. template.setVmType(model.getVmType()); - template.setname(name); + template.setName(name); template.setOs((VmOsType) model.getOSType().getSelectedItem()); template.setNumOfMonitors((Integer) model.getNumOfMonitors().getSelectedItem()); template.setAllowConsoleReconnect((Boolean) model.getAllowConsoleReconnect().getEntity()); @@ -758,7 +758,7 @@ @Override protected String extractNameFromEntity(VmTemplate entity) { - return entity.getname(); + return entity.getName(); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java index 0840121..9b9d4f6 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java @@ -37,7 +37,7 @@ { if (getEntity() != null) { - setSearchString("Vms: template.name=" + getEntity().getname()); //$NON-NLS-1$ + setSearchString("Vms: template.name=" + getEntity().getName()); //$NON-NLS-1$ super.Search(); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java index 62b61c6..e23666a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java @@ -13,7 +13,7 @@ } super.SyncSearch(VdcQueryType.GetAllAuditLogsByVMTemplateName, - new GetAllAuditLogsByVMTemplateNameParameters(getEntity().getname())); + new GetAllAuditLogsByVMTemplateNameParameters(getEntity().getName())); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java index f2c1095..d61767c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java @@ -134,7 +134,7 @@ private void InitTemplate() { // Update model state according to VM properties. - getModel().getName().setEntity(this.template.getname()); + getModel().getName().setEntity(this.template.getName()); getModel().getDescription().setEntity(this.template.getDescription()); getModel().getMemSize().setEntity(this.template.getMemSizeMb()); getModel().getOSType().setSelectedItem(this.template.getOs()); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedTemplateView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedTemplateView.java index 5ddffde..e448af7 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedTemplateView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/extended/SideTabExtendedTemplateView.java @@ -75,7 +75,7 @@ public void render(Context context, VmTemplate template, SafeHtmlBuilder sb) { sb.append(templates.vmNameCellItem( ElementIdUtils.createTableCellElementId(elementIdPrefix, "name", context), //$NON-NLS-1$ - template.getname())); + template.getName())); String description = template.getDescription(); if (description != null && !description.isEmpty()) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java index 62a7789..b12c9f5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java @@ -70,7 +70,7 @@ // Template else if (businessEntity instanceof VmTemplate) { - obj.setProperty("name", ((VmTemplate) businessEntity).getname()); //$NON-NLS-1$ + obj.setProperty("name", ((VmTemplate) businessEntity).getName()); //$NON-NLS-1$ } // VirtualMachine diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java index 2bbd949..b6a1eba 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java @@ -104,7 +104,7 @@ suffixEditor.setLabel(constants.cloneImportSuffixVm()); } else { dialogLabelEditor.setText(constants.sameTemplateNameExists() - + " (" + ((VmTemplate) object.getEntity()).getname() + ")");//$NON-NLS-1$ //$NON-NLS-2$ + + " (" + ((VmTemplate) object.getEntity()).getName() + ")");//$NON-NLS-1$ //$NON-NLS-2$ cloneEditor.setLabel(constants.cloneImportTemplate()); suffixEditor.setLabel(constants.cloneImportSuffixTemplate()); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java index 0c5b69d..6476b8c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java @@ -38,7 +38,7 @@ TextColumnWithTooltip<Object> nameColumn = new TextColumnWithTooltip<Object>() { @Override public String getValue(Object object) { - return ((VmTemplate) object).getname(); + return ((VmTemplate) object).getName(); } }; table.addColumn(nameColumn, constants.nameTemplate(), "150px"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java index d1b8f20..ff1902a 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java @@ -39,7 +39,7 @@ TextColumnWithTooltip<VmTemplate> nameColumn = new TextColumnWithTooltip<VmTemplate>() { @Override public String getValue(VmTemplate object) { - return object.getname(); + return object.getName(); } }; getTable().addColumn(nameColumn, constants.namePool(), "150px"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java index 9ef6269..fe33dea 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskTemplateView.java @@ -38,7 +38,7 @@ TextColumnWithTooltip<VmTemplate> nameColumn = new TextColumnWithTooltip<VmTemplate>() { @Override public String getValue(VmTemplate object) { - return object.getname(); + return object.getName(); } }; getTable().addColumn(nameColumn, constants.nameTemplate()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java index 86a1078..8c98654 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java @@ -40,7 +40,7 @@ TextColumnWithTooltip<PairQueryable<VmNetworkInterface, VmTemplate>> nameColumn = new TextColumnWithTooltip<PairQueryable<VmNetworkInterface, VmTemplate>>() { @Override public String getValue(PairQueryable<VmNetworkInterface, VmTemplate> object) { - return object.getSecond().getname(); + return object.getSecond().getName(); } }; getTable().addColumn(nameColumn, constants.nameTemplate()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageTemplateBackupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageTemplateBackupView.java index a3307df..e197dbb 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageTemplateBackupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageTemplateBackupView.java @@ -36,7 +36,7 @@ new TextColumnWithTooltip<VmTemplate>() { @Override public String getValue(VmTemplate object) { - return object.getname(); + return object.getName(); } }; getTable().addColumn(nameColumn, constants.nameTemplate()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java index 362f25f..b3a9c55 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/storage/TemplatesTree.java @@ -43,7 +43,7 @@ panel.setWidth("100%"); //$NON-NLS-1$ addItemToPanel(panel, new Image(resources.vmImage()), "25px"); //$NON-NLS-1$ - addTextBoxToPanel(panel, new TextBoxLabel(), template.getname(), ""); //$NON-NLS-1$ + addTextBoxToPanel(panel, new TextBoxLabel(), template.getName(), ""); //$NON-NLS-1$ addValueLabelToPanel(panel, new DiskSizeLabel<Integer>(), template.getDiskMap().size(), "110px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new DiskSizeLabel<Double>(), template.getActualDiskSize(), "110px"); //$NON-NLS-1$ addValueLabelToPanel(panel, new FullDateTimeLabel(), template.getCreationDate(), "140px"); //$NON-NLS-1$ -- To view, visit http://gerrit.ovirt.org/11953 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia82008d836b69967a3a59901db8327a84dfe14ea Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
