Daniel Erez has uploaded a new change for review. Change subject: webadmin: DiskModel - naming convention cleanup ......................................................................
webadmin: DiskModel - naming convention cleanup DiskModel: * Renamed variable names (Java conventions). * Reorganized variables getters/setters (and remove redundant). * Removed redundant call to deprecated GetDiskPresetList. (removed GetDiskPresetList from AsyncDataProvider). Change-Id: Iac9d635a411a0f7d54cc0e316ac831f0823df3d0 Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.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/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java 5 files changed, 299 insertions(+), 474 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/12579/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java index cbef76f..aca5c3f 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java @@ -93,7 +93,7 @@ EntityModelTextBoxEditor descriptionEditor; @UiField(provided = true) - @Path("interface.selectedItem") + @Path("diskInterface.selectedItem") @WithElementId("interface") ListModelListBoxEditor<Object> interfaceEditor; @@ -128,7 +128,7 @@ ListModelListBoxEditor<Object> storageTypeEditor; @UiField(provided = true) - @Path("wipeAfterDelete.entity") + @Path("isWipeAfterDelete.entity") @WithElementId("wipeAfterDelete") EntityModelCheckBoxEditor wipeAfterDeleteEditor; @@ -148,7 +148,7 @@ EntityModelCheckBoxEditor isPluggedEditor; @UiField(provided = true) - @Path("attachDisk.entity") + @Path("isAttachDisk.entity") @WithElementId("attachDisk") EntityModelCheckBoxEditor attachEditor; @@ -517,7 +517,7 @@ public void edit(final DiskModel disk) { Driver.driver.edit(disk); - disk.getAttachDisk().getEntityChangedEvent().addListener(new IEventListener() { + disk.getIsAttachDisk().getEntityChangedEvent().addListener(new IEventListener() { @Override public void eventRaised(Event ev, Object sender, EventArgs args) { boolean isAttach = (Boolean) ((EntityModel) sender).getEntity(); @@ -623,7 +623,7 @@ } private void revealDiskPanel(final DiskModel disk) { - boolean isAttachDisk = (Boolean) disk.getAttachDisk().getEntity(); + boolean isAttachDisk = (Boolean) disk.getIsAttachDisk().getEntity(); boolean isInternal = internalDiskRadioButton.getValue(); boolean isInVm = disk.getVm() != null; 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 9d1d215..29d708e 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 @@ -193,15 +193,6 @@ } - public static class DiskModelByNameComparer implements Comparator<DiskModel> - { - @Override - public int compare(DiskModel x, DiskModel y) - { - return x.getName().compareTo(y.getName()); - } - } - public static class DiskModelByAliasComparer implements Comparator<DiskModel> { @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index 9d4c52d..4de6fd3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -17,7 +17,6 @@ import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.DiskImage; -import org.ovirt.engine.core.common.businessentities.DiskImageBase; import org.ovirt.engine.core.common.businessentities.DiskInterface; import org.ovirt.engine.core.common.businessentities.IVdcQueryable; import org.ovirt.engine.core.common.businessentities.LUNs; @@ -961,38 +960,6 @@ Frontend.RunQuery(VdcQueryType.GetStorageDomainById, new StorageDomainQueryParametersBase(storageDomainId), aQuery); - } - - public static void GetDiskPresetList(AsyncQuery aQuery, StorageType storageType) { - aQuery.setData(new Object[] { storageType }); - aQuery.converterCallback = new IAsyncConverter() { - @Override - public Object Convert(Object source, AsyncQuery _asyncQuery) - { - if (source == null) { - return null; - } - - ArrayList<DiskImageBase> list = new ArrayList<DiskImageBase>(); - StorageType storageType = (StorageType) _asyncQuery.Data[0]; - boolean hasBootDisk = false; - for (DiskImageBase disk : (ArrayList<DiskImageBase>) source) { - if (!hasBootDisk) { - disk.setBoot(true); - hasBootDisk = true; - } - - disk.setVolumeType(storageType == StorageType.ISCSI || storageType == StorageType.FCP ? - VolumeType.Preallocated : VolumeType.Sparse); - - disk.setvolumeFormat(GetDiskVolumeFormat(disk.getVolumeType(), storageType)); - - list.add(disk); - } - return list; - } - }; - Frontend.RunQuery(VdcQueryType.GetDiskConfigurationList, new VdcQueryParametersBase(), aQuery); } public static VolumeFormat GetDiskVolumeFormat(VolumeType volumeType, StorageType storageType) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java index 5fee1ac..411cfc1 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java @@ -64,361 +64,45 @@ import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult; import org.ovirt.engine.ui.uicompat.IEventListener; import org.ovirt.engine.ui.uicompat.IFrontendActionAsyncCallback; -import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; public class DiskModel extends Model { private static final Constants CONSTANTS = ConstantsManager.getInstance().getConstants(); - private boolean privateIsNew; + private boolean isNew; + private VM vm; + private SanStorageModel sanStorageModel; + private String hash; - public boolean getIsNew() - { - return privateIsNew; - } - - public void setIsNew(boolean value) - { - privateIsNew = value; - } - - private String privateName; - - public String getName() - { - return privateName; - } - - public void setName(String value) - { - privateName = value; - } - - private EntityModel privateAlias; - - public EntityModel getAlias() - { - return privateAlias; - } - - public void setAlias(EntityModel value) - { - privateAlias = value; - } - - private EntityModel privateDescription; - - public EntityModel getDescription() - { - return privateDescription; - } - - public void setDescription(EntityModel value) - { - privateDescription = value; - } - - private VolumeFormat privateVolumeFormat = getVolumeFormat().values()[0]; - - public VolumeFormat getVolumeFormat() - { - return privateVolumeFormat; - } - - public void setVolumeFormat(VolumeFormat value) - { - privateVolumeFormat = value; - } - - private Date privateCreationDate = new Date(0); - - public Date getCreationDate() - { - return privateCreationDate; - } - - public void setCreationDate(Date value) - { - privateCreationDate = value; - } - - private int privateActualSize; - - public int getActualSize() - { - return privateActualSize; - } - - public void setActualSize(int value) - { - privateActualSize = value; - } - - private EntityModel privateSize; - - public EntityModel getSize() - { - return privateSize; - } - - public void setSize(EntityModel value) - { - privateSize = value; - } - - private ListModel privatePreset; - - public ListModel getPreset() - { - return privatePreset; - } - - public void setPreset(ListModel value) - { - privatePreset = value; - } - - private ListModel privateVolumeType; - - public ListModel getVolumeType() - { - return privateVolumeType; - } - - public void setVolumeType(ListModel value) - { - privateVolumeType = value; - } - - private ListModel storageType; - - public ListModel getStorageType() - { - return storageType; - } - - public void setStorageType(ListModel value) - { - storageType = value; - } - - private ListModel privateInterface; - - public ListModel getInterface() - { - return privateInterface; - } - - public void setInterface(ListModel value) - { - privateInterface = value; - } - - private ListModel privateSourceStorageDomain; - - public ListModel getSourceStorageDomain() - { - return privateSourceStorageDomain; - } - - public void setSourceStorageDomain(ListModel value) - { - privateSourceStorageDomain = value; - } - - private ListModel privateStorageDomain; - - public ListModel getStorageDomain() - { - return privateStorageDomain; - } - - public void setStorageDomain(ListModel value) - { - privateStorageDomain = value; - } - - private ListModel privateHost; - - public ListModel getHost() - { - return privateHost; - } - - private void setHost(ListModel value) - { - privateHost = value; - } - - private EntityModel privateWipeAfterDelete; - - public EntityModel getWipeAfterDelete() - { - return privateWipeAfterDelete; - } - - public void setWipeAfterDelete(EntityModel value) - { - privateWipeAfterDelete = value; - } - - private EntityModel privateIsBootable; - - public EntityModel getIsBootable() - { - return privateIsBootable; - } - - public void setIsBootable(EntityModel value) - { - privateIsBootable = value; - } - - private EntityModel privateIsShareable; - - public EntityModel getIsShareable() - { - return privateIsShareable; - } - - public void setIsShareable(EntityModel value) - { - privateIsShareable = value; - } - - private EntityModel privateIsPlugged; - - public EntityModel getIsPlugged() - { - return privateIsPlugged; - } - - public void setIsPlugged(EntityModel value) - { - privateIsPlugged = value; - } - - private Disk privateDisk; - - public Disk getDisk() - { - return privateDisk; - } - - public void setDisk(Disk value) - { - privateDisk = value; - } - + private Disk disk; + private VolumeFormat volumeFormat; + private EntityModel size; + private EntityModel alias; + private EntityModel description; private EntityModel sourceStorageDomainName; - - public EntityModel getSourceStorageDomainName() - { - return sourceStorageDomainName; - } - - public void setSourceStorageDomainName(EntityModel value) - { - sourceStorageDomainName = value; - } - - private ListModel privateDataCenter; - - public ListModel getDataCenter() - { - return privateDataCenter; - } - - private void setDataCenter(ListModel value) - { - privateDataCenter = value; - } - - private ListModel quota; - - public ListModel getQuota() - { - return quota; - } - - public void setQuota(ListModel value) - { - quota = value; - } - - private EntityModel privateAttachDisk; - - public EntityModel getAttachDisk() - { - return privateAttachDisk; - } - - public void setAttachDisk(EntityModel value) - { - privateAttachDisk = value; - } - - private ListModel internalAttachableDisks; - - public ListModel getInternalAttachableDisks() - { - return internalAttachableDisks; - } - - public void setInternalAttachableDisks(ListModel value) - { - internalAttachableDisks = value; - } - - private ListModel externalAttachableDisks; - - public ListModel getExternalAttachableDisks() - { - return externalAttachableDisks; - } - - public void setExternalAttachableDisks(ListModel value) - { - externalAttachableDisks = value; - } - + private EntityModel isWipeAfterDelete; + private EntityModel isBootable; + private EntityModel isShareable; + private EntityModel isPlugged; + private EntityModel isAttachDisk; private EntityModel isInternal; - - public EntityModel getIsInternal() - { - return isInternal; - } - - public void setIsInternal(EntityModel value) - { - isInternal = value; - } - private EntityModel isDirectLunDiskAvaialable; - public EntityModel getIsDirectLunDiskAvaialable() - { - return isDirectLunDiskAvaialable; - } + private ListModel volumeType; + private ListModel storageType; + private ListModel diskInterface; + private ListModel sourceStorageDomain; + private ListModel storageDomain; + private ListModel host; + private ListModel dataCenter; + private ListModel quota; + private ListModel internalAttachableDisks; + private ListModel externalAttachableDisks; - public void setIsDirectLunDiskAvaialable(EntityModel value) - { - isDirectLunDiskAvaialable = value; - } - - private SanStorageModel sanStorageModel; - - public SanStorageModel getSanStorageModel() - { - return sanStorageModel; - } - - public void setSanStorageModel(SanStorageModel value) - { - sanStorageModel = value; - } - - private VM vm; + private SystemTreeItemModel systemTreeSelectedItem; + private UICommand cancelCommand; + private boolean previousWipeAfterDeleteEntity; + private boolean previousIsQuotaAvailable; public VM getVm() { return vm; @@ -428,49 +112,259 @@ this.vm = vm; } - private String hash; + public SanStorageModel getSanStorageModel() { + return sanStorageModel; + } - public String getHash() - { + public void setSanStorageModel(SanStorageModel sanStorageModel) { + this.sanStorageModel = sanStorageModel; + } + + public String getHash() { return hash; } - public void setHash(String hash) - { + public void setHash(String hash) { this.hash = hash; } - private SystemTreeItemModel systemTreeSelectedItem; + public boolean getIsNew() { + return isNew; + } - public SystemTreeItemModel getSystemTreeSelectedItem() - { + public void setIsNew(boolean isNew) { + this.isNew = isNew; + } + + public EntityModel getIsWipeAfterDelete() { + return isWipeAfterDelete; + } + + public void setIsWipeAfterDelete(EntityModel isWipeAfterDelete) { + this.isWipeAfterDelete = isWipeAfterDelete; + } + + public EntityModel getIsBootable() { + return isBootable; + } + + public void setIsBootable(EntityModel isBootable) { + this.isBootable = isBootable; + } + + public EntityModel getIsShareable() { + return isShareable; + } + + public void setIsShareable(EntityModel isShareable) { + this.isShareable = isShareable; + } + + public EntityModel getIsPlugged() { + return isPlugged; + } + + public void setIsPlugged(EntityModel isPlugged) { + this.isPlugged = isPlugged; + } + + public EntityModel getIsAttachDisk() { + return isAttachDisk; + } + + public void setIsAttachDisk(EntityModel isAttachDisk) { + this.isAttachDisk = isAttachDisk; + } + + public EntityModel getIsInternal() { + return isInternal; + } + + public void setIsInternal(EntityModel isInternal) { + this.isInternal = isInternal; + } + + public EntityModel getIsDirectLunDiskAvaialable() { + return isDirectLunDiskAvaialable; + } + + public void setIsDirectLunDiskAvaialable(EntityModel isDirectLunDiskAvaialable) { + this.isDirectLunDiskAvaialable = isDirectLunDiskAvaialable; + } + + public EntityModel getSize() { + return size; + } + + public void setSize(EntityModel size) { + this.size = size; + } + + public EntityModel getAlias() { + return alias; + } + + public void setAlias(EntityModel alias) { + this.alias = alias; + } + + public EntityModel getDescription() { + return description; + } + + public void setDescription(EntityModel description) { + this.description = description; + } + + public EntityModel getSourceStorageDomainName() { + return sourceStorageDomainName; + } + + public void setSourceStorageDomainName(EntityModel sourceStorageDomainName) { + this.sourceStorageDomainName = sourceStorageDomainName; + } + + public VolumeFormat getVolumeFormat() { + return volumeFormat; + } + + public void setVolumeFormat(VolumeFormat volumeFormat) { + this.volumeFormat = volumeFormat; + } + + public Disk getDisk() { + return disk; + } + + public void setDisk(Disk disk) { + this.disk = disk; + } + + public ListModel getVolumeType() { + return volumeType; + } + + public void setVolumeType(ListModel volumeType) { + this.volumeType = volumeType; + } + + public ListModel getStorageType() { + return storageType; + } + + public void setStorageType(ListModel storageType) { + this.storageType = storageType; + } + + public ListModel getDiskInterface() { + return diskInterface; + } + + public void setDiskInterface(ListModel diskInterface) { + this.diskInterface = diskInterface; + } + + public ListModel getSourceStorageDomain() { + return sourceStorageDomain; + } + + public void setSourceStorageDomain(ListModel sourceStorageDomain) { + this.sourceStorageDomain = sourceStorageDomain; + } + + public ListModel getStorageDomain() { + return storageDomain; + } + + public void setStorageDomain(ListModel storageDomain) { + this.storageDomain = storageDomain; + } + + public ListModel getHost() { + return host; + } + + public void setHost(ListModel host) { + this.host = host; + } + + public ListModel getDataCenter() { + return dataCenter; + } + + public void setDataCenter(ListModel dataCenter) { + this.dataCenter = dataCenter; + } + + public ListModel getQuota() { + return quota; + } + + public void setQuota(ListModel quota) { + this.quota = quota; + } + + public ListModel getInternalAttachableDisks() { + return internalAttachableDisks; + } + + public void setInternalAttachableDisks(ListModel internalAttachableDisks) { + this.internalAttachableDisks = internalAttachableDisks; + } + + public ListModel getExternalAttachableDisks() { + return externalAttachableDisks; + } + + public void setExternalAttachableDisks(ListModel externalAttachableDisks) { + this.externalAttachableDisks = externalAttachableDisks; + } + + public SystemTreeItemModel getSystemTreeSelectedItem() { return systemTreeSelectedItem; } - public void setSystemTreeSelectedItem(SystemTreeItemModel value) - { - systemTreeSelectedItem = value; - OnPropertyChanged(new PropertyChangedEventArgs("SystemTreeSelectedItem")); //$NON-NLS-1$ - } - - private UICommand cancelCommand; - - public void setCancelCommand(UICommand cancelCommand) { - this.cancelCommand = cancelCommand; + public void setSystemTreeSelectedItem(SystemTreeItemModel systemTreeSelectedItem) { + this.systemTreeSelectedItem = systemTreeSelectedItem; } public UICommand getCancelCommand() { return cancelCommand; } - private boolean previousWipeAfterDeleteEntity; - private boolean previousIsQuotaAvailable; + public void setCancelCommand(UICommand cancelCommand) { + this.cancelCommand = cancelCommand; + } + + public boolean isPreviousWipeAfterDeleteEntity() { + return previousWipeAfterDeleteEntity; + } + + public void setPreviousWipeAfterDeleteEntity(boolean previousWipeAfterDeleteEntity) { + this.previousWipeAfterDeleteEntity = previousWipeAfterDeleteEntity; + } + + public boolean isPreviousIsQuotaAvailable() { + return previousIsQuotaAvailable; + } + + public void setPreviousIsQuotaAvailable(boolean previousIsQuotaAvailable) { + this.previousIsQuotaAvailable = previousIsQuotaAvailable; + } + + public int getQueryCounter() { + return queryCounter; + } + + public void setQueryCounter(int queryCounter) { + this.queryCounter = queryCounter; + } public DiskModel() { setSize(new EntityModel()); getSize().setIsValid(true); - setInterface(new ListModel()); + setDiskInterface(new ListModel()); setStorageDomain(new ListModel()); setQuota(new ListModel()); @@ -487,9 +381,6 @@ getDataCenter().setIsAvailable(false); getDataCenter().getSelectedItemChangedEvent().addListener(this); - setPreset(new ListModel()); - getPreset().getSelectedItemChangedEvent().addListener(this); - setVolumeType(new ListModel()); getVolumeType().setItems(AsyncDataProvider.GetVolumeTypeList()); getVolumeType().getSelectedItemChangedEvent().addListener(this); @@ -499,9 +390,13 @@ getStorageType().setItems(AsyncDataProvider.GetStorageTypeList()); getStorageType().getSelectedItemChangedEvent().addListener(this); - setWipeAfterDelete(new EntityModel()); - getWipeAfterDelete().setEntity(false); - getWipeAfterDelete().getEntityChangedEvent().addListener(this); + setIsWipeAfterDelete(new EntityModel()); + getIsWipeAfterDelete().setEntity(false); + getIsWipeAfterDelete().getEntityChangedEvent().addListener(this); + + setIsAttachDisk(new EntityModel()); + getIsAttachDisk().setEntity(false); + getIsAttachDisk().getEntityChangedEvent().addListener(this); setIsBootable(new EntityModel()); getIsBootable().setEntity(false); @@ -511,10 +406,6 @@ setIsPlugged(new EntityModel()); getIsPlugged().setEntity(true); - - setAttachDisk(new EntityModel()); - getAttachDisk().setEntity(false); - getAttachDisk().getEntityChangedEvent().addListener(this); setQuota(new ListModel()); getQuota().setIsAvailable(false); @@ -547,8 +438,8 @@ // Add progress listeners Frontend.getQueryStartedEvent().addListener(this); Frontend.getQueryCompleteEvent().addListener(this); - Frontend.subscribeAdditionalQueries(new VdcQueryType[] { VdcQueryType.Search, VdcQueryType.GetStoragePoolById, - VdcQueryType.GetNextAvailableDiskAliasNameByVMId, VdcQueryType.GetDiskConfigurationList, + Frontend.subscribeAdditionalQueries(new VdcQueryType[] { VdcQueryType.Search, + VdcQueryType.GetStoragePoolById, VdcQueryType.GetNextAvailableDiskAliasNameByVMId, VdcQueryType.GetPermittedStorageDomainsByStoragePoolId, VdcQueryType.GetAllVdsByStoragePool, VdcQueryType.GetAllAttachableDisks, VdcQueryType.GetAllDisksByVmId, VdcQueryType.GetAllRelevantQuotasForStorage }); @@ -577,7 +468,7 @@ getStorageType().setIsChangable(false); getDataCenter().setIsChangable(false); getVolumeType().setIsChangable(false); - getInterface().setIsChangable(!getDisk().isShareable()); + getDiskInterface().setIsChangable(!getDisk().isShareable()); getSize().setIsChangable(false); getSize().setEntity(getDisk().getDiskStorageType() == DiskStorageType.IMAGE ? ((DiskImage) getDisk()).getSizeInGigabytes() : @@ -588,7 +479,7 @@ getDescription().setEntity(getDisk().getDiskDescription()); getIsBootable().setEntity(getDisk().isBoot()); getIsShareable().setEntity(getDisk().isShareable()); - getWipeAfterDelete().setEntity(getDisk().isWipeAfterDelete()); + getIsWipeAfterDelete().setEntity(getDisk().isWipeAfterDelete()); if (getDisk().getDiskStorageType() == DiskStorageType.IMAGE) { DiskImage diskImage = (DiskImage) getDisk(); @@ -691,9 +582,9 @@ return; } - getInterface().setItems(AsyncDataProvider.GetDiskInterfaceList( + getDiskInterface().setItems(AsyncDataProvider.GetDiskInterfaceList( VmOsType.Unassigned, datacenter.getcompatibility_version())); - getInterface().setSelectedItem(getIsNew() ? + getDiskInterface().setSelectedItem(getIsNew() ? AsyncDataProvider.GetDefaultDiskInterface(VmOsType.Unassigned, null) : getDisk().getDiskInterface()); } @@ -718,7 +609,6 @@ Linq.Sort(filteredStorageDomains, new Linq.StorageDomainByNameComparer()); StorageDomain storage = Linq.FirstOrDefault(filteredStorageDomains); - StorageType storageType = storage == null ? StorageType.UNKNOWN : storage.getStorageType(); diskModel.getStorageDomain().setItems(filteredStorageDomains); diskModel.getStorageDomain().setSelectedItem(storage); @@ -730,17 +620,6 @@ else { diskModel.setMessage(CONSTANTS.noActiveStorageDomainsInDC()); } - - AsyncDataProvider.GetDiskPresetList(new AsyncQuery(diskModel, new INewAsyncCallback() { - @Override - public void OnSuccess(Object target, Object returnValue) { - DiskModel diskModel = (DiskModel) target; - ArrayList<DiskImageBase> presets = (ArrayList<DiskImageBase>) returnValue; - - diskModel.getPreset().setItems(presets); - diskModel.getPreset().setSelectedItem(Linq.FirstOrDefault(presets)); - } - }, getHash()), storageType); } }, getHash()), datacenter.getId(), ActionGroup.CREATE_DISK); } @@ -857,17 +736,17 @@ private void updateWipeAfterDelete(StorageType storageType) { if (storageType.isFileDomain()) { - getWipeAfterDelete().setChangeProhibitionReason(CONSTANTS.wipeAfterDeleteNotSupportedForFileDomains()); - getWipeAfterDelete().setIsChangable(false); - getWipeAfterDelete().setEntity(false); + getIsWipeAfterDelete().setChangeProhibitionReason(CONSTANTS.wipeAfterDeleteNotSupportedForFileDomains()); + getIsWipeAfterDelete().setIsChangable(false); + getIsWipeAfterDelete().setEntity(false); } else { - getWipeAfterDelete().setIsChangable(true); - getWipeAfterDelete().setEntity((Boolean) AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.SANWipeAfterDelete)); + getIsWipeAfterDelete().setIsChangable(true); + getIsWipeAfterDelete().setEntity((Boolean) AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.SANWipeAfterDelete)); } if (!getIsNew()) { - getWipeAfterDelete().setEntity(getDisk().isWipeAfterDelete()); + getIsWipeAfterDelete().setEntity(getDisk().isWipeAfterDelete()); } } @@ -920,29 +799,20 @@ getSize().setIsAvailable(isInternal); getStorageDomain().setIsAvailable(isInternal); getVolumeType().setIsAvailable(isInternal); - getWipeAfterDelete().setIsAvailable(isInternal); + getIsWipeAfterDelete().setIsAvailable(isInternal); getHost().setIsAvailable(!isInternal); getStorageType().setIsAvailable(!isInternal); getDataCenter().setIsAvailable(!isInVm); if (!isInternal) { - previousWipeAfterDeleteEntity = (Boolean) getWipeAfterDelete().getEntity(); + previousWipeAfterDeleteEntity = (Boolean) getIsWipeAfterDelete().getEntity(); previousIsQuotaAvailable = getQuota().getIsAvailable(); } - getWipeAfterDelete().setEntity(isInternal ? previousWipeAfterDeleteEntity : false); + getIsWipeAfterDelete().setEntity(isInternal ? previousWipeAfterDeleteEntity : false); getQuota().setIsAvailable(isInternal ? previousIsQuotaAvailable : false); updateDatacenters(); - } - - private void Preset_SelectedItemChanged() - { - DiskImageBase preset = (DiskImageBase) getPreset().getSelectedItem() != null ? - (DiskImageBase) getPreset().getSelectedItem() - : (DiskImageBase) Linq.<DiskImageBase> FirstOrDefault(getPreset().getItems()); - setVolumeFormat(preset.getVolumeFormat()); - getVolumeType().setSelectedItem(preset.getVolumeType()); } private void VolumeType_SelectedItemChanged() @@ -961,15 +831,15 @@ private void WipeAfterDelete_EntityChanged(EventArgs e) { - if (!getWipeAfterDelete().getIsChangable() && (Boolean) getWipeAfterDelete().getEntity()) + if (!getIsWipeAfterDelete().getIsChangable() && (Boolean) getIsWipeAfterDelete().getEntity()) { - getWipeAfterDelete().setEntity(false); + getIsWipeAfterDelete().setEntity(false); } } private void AttachDisk_EntityChanged(EventArgs e) { - if ((Boolean) getAttachDisk().getEntity()) + if ((Boolean) getIsAttachDisk().getEntity()) { // Get internal attachable disks AsyncDataProvider.GetAllAttachableDisks(new AsyncQuery(this, new INewAsyncCallback() { @@ -1025,7 +895,7 @@ public boolean Validate() { - if ((Boolean) getAttachDisk().getEntity()) { + if ((Boolean) getIsAttachDisk().getEntity()) { if (getInternalAttachableDisks().getSelectedItems() == null && getExternalAttachableDisks().getSelectedItems() == null) { getInvalidityReasons().add(CONSTANTS.noDisksSelected()); @@ -1149,7 +1019,7 @@ return; } - if ((Boolean) getAttachDisk().getEntity()) { + if ((Boolean) getIsAttachDisk().getEntity()) { OnAttachDisks(); return; } @@ -1184,8 +1054,8 @@ disk.setDiskAlias((String) getAlias().getEntity()); disk.setDiskDescription((String) getDescription().getEntity()); - disk.setDiskInterface((DiskInterface) getInterface().getSelectedItem()); - disk.setWipeAfterDelete((Boolean) getWipeAfterDelete().getEntity()); + disk.setDiskInterface((DiskInterface) getDiskInterface().getSelectedItem()); + disk.setWipeAfterDelete((Boolean) getIsWipeAfterDelete().getEntity()); disk.setBoot((Boolean) getIsBootable().getEntity()); disk.setShareable((Boolean) getIsShareable().getEntity()); disk.setPlugged((Boolean) getIsPlugged().getEntity()); @@ -1241,21 +1111,17 @@ { super.eventRaised(ev, sender, args); - if (ev.matchesDefinition(EntityModel.EntityChangedEventDefinition) && sender == getWipeAfterDelete()) + if (ev.matchesDefinition(EntityModel.EntityChangedEventDefinition) && sender == getIsWipeAfterDelete()) { WipeAfterDelete_EntityChanged(args); } - else if (ev.matchesDefinition(EntityModel.EntityChangedEventDefinition) && sender == getAttachDisk()) + else if (ev.matchesDefinition(EntityModel.EntityChangedEventDefinition) && sender == getIsAttachDisk()) { AttachDisk_EntityChanged(args); } else if (ev.matchesDefinition(ListModel.EntityChangedEventDefinition) && sender == getIsInternal()) { IsInternal_EntityChanged(); - } - else if (ev.matchesDefinition(ListModel.SelectedItemChangedEventDefinition) && sender == getPreset()) - { - Preset_SelectedItemChanged(); } else if (ev.matchesDefinition(ListModel.SelectedItemChangedEventDefinition) && sender == getVolumeType()) { @@ -1294,4 +1160,5 @@ StopProgress(); } } + } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java index 6e4ea11..fe8d624 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java @@ -234,7 +234,7 @@ return; } - if ((Boolean) model.getAttachDisk().getEntity()) + if ((Boolean) model.getIsAttachDisk().getEntity()) { OnAttachDisks(); return; @@ -267,8 +267,8 @@ disk.setDiskAlias((String) model.getAlias().getEntity()); disk.setDiskDescription((String) model.getDescription().getEntity()); - disk.setDiskInterface((DiskInterface) model.getInterface().getSelectedItem()); - disk.setWipeAfterDelete((Boolean) model.getWipeAfterDelete().getEntity()); + disk.setDiskInterface((DiskInterface) model.getDiskInterface().getSelectedItem()); + disk.setWipeAfterDelete((Boolean) model.getIsWipeAfterDelete().getEntity()); disk.setBoot((Boolean) model.getIsBootable().getEntity()); disk.setShareable((Boolean) model.getIsShareable().getEntity()); disk.setPlugged((Boolean) model.getIsPlugged().getEntity()); -- To view, visit http://gerrit.ovirt.org/12579 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac9d635a411a0f7d54cc0e316ac831f0823df3d0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
