Arik Hadas has uploaded a new change for review. Change subject: webadmin: cleanup in import related classes ......................................................................
webadmin: cleanup in import related classes Minor refactoring in classes that are related to import VM/template. Change-Id: Iea29951e644e205a959df83940ca0989f427d82f Signed-off-by: Arik Hadas <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ManageBackupModel.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/storage/VmBackupModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java 4 files changed, 122 insertions(+), 183 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/40446/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ManageBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ManageBackupModel.java index 45a7b3f..e88edfc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ManageBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ManageBackupModel.java @@ -7,89 +7,72 @@ import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; -@SuppressWarnings("unused") public abstract class ManageBackupModel extends SearchableListModel<StorageDomain, Object> { - private UICommand privateRestoreCommand; + private UICommand restoreCommand; + private UICommand removeCommand; + private boolean refreshing; - public UICommand getRestoreCommand() - { - return privateRestoreCommand; + protected final String CANCEL_COMMAND = "Cancel"; //$NON-NLS-1$ + protected final String CANCEL_CONFIRMATION_COMMAND = "CancelConfirm"; //$NON-NLS-1$ + + public UICommand getRestoreCommand() { + return restoreCommand; } - private void setRestoreCommand(UICommand value) - { - privateRestoreCommand = value; + private void setRestoreCommand(UICommand value) { + restoreCommand = value; } - private UICommand privateRemoveCommand; - - public UICommand getRemoveCommand() - { - return privateRemoveCommand; + public UICommand getRemoveCommand() { + return removeCommand; } - private void setRemoveCommand(UICommand value) - { - privateRemoveCommand = value; + private void setRemoveCommand(UICommand value) { + removeCommand = value; } - private boolean isRefreshing; - - public boolean getIsRefreshing() - { - return isRefreshing; + public boolean getIsRefreshing() { + return refreshing; } - public void setIsRefreshing(boolean value) - { - if (isRefreshing != value) - { - isRefreshing = value; + public void setIsRefreshing(boolean value) { + if (refreshing != value) { + refreshing = value; onPropertyChanged(new PropertyChangedEventArgs("IsRefreshing")); //$NON-NLS-1$ } } - protected ManageBackupModel() - { + protected ManageBackupModel() { setRestoreCommand(new UICommand("Restore", this)); //$NON-NLS-1$ setRemoveCommand(new UICommand("Remove", this)); //$NON-NLS-1$ } - protected void remove() - { - } + protected abstract void remove(); - protected void restore() - { - } + protected abstract void restore(); - protected void cancel() - { + protected void cancel() { cancelConfirm(); setWindow(null); } - protected void cancelConfirm() - { + protected void cancelConfirm() { setConfirmWindow(null); } @Override - protected void entityPropertyChanged(Object sender, PropertyChangedEventArgs e) - { + protected void entityPropertyChanged(Object sender, PropertyChangedEventArgs e) { super.entityPropertyChanged(sender, e); - if (e.propertyName.equals("storage_domain_shared_status")) //$NON-NLS-1$ - { + if (e.propertyName.equals("storage_domain_shared_status")) { //$NON-NLS-1$ checkStorageStatus(); } } @Override - protected void onEntityChanged() - { + protected void onEntityChanged() { super.onEntityChanged(); checkStorageStatus(); @@ -98,46 +81,36 @@ getSearchCommand().execute(); } - private void checkStorageStatus() - { - if (getEntity() != null) - { - if (getEntity().getStorageDomainSharedStatus() == StorageDomainSharedStatus.Inactive - || getEntity().getStorageDomainSharedStatus() == StorageDomainSharedStatus.Mixed) - { - setMessage(ConstantsManager.getInstance().getConstants().theExportDomainIsInactiveMsg()); - } - else if (getEntity().getStorageDomainSharedStatus() == StorageDomainSharedStatus.Unattached) - { - setMessage(ConstantsManager.getInstance().getConstants().ExportDomainIsNotAttachedToAnyDcMsg()); - } - else - { - setMessage(null); - } + private void checkStorageStatus() { + if (getEntity() == null) { + return; + } + + if (getEntity().getStorageDomainSharedStatus() == StorageDomainSharedStatus.Inactive + || getEntity().getStorageDomainSharedStatus() == StorageDomainSharedStatus.Mixed) { + setMessage(ConstantsManager.getInstance().getConstants().theExportDomainIsInactiveMsg()); + } + else if (getEntity().getStorageDomainSharedStatus() == StorageDomainSharedStatus.Unattached) { + setMessage(ConstantsManager.getInstance().getConstants().ExportDomainIsNotAttachedToAnyDcMsg()); + } + else { + setMessage(null); } } @Override - protected void onSelectedItemChanged() - { + protected void onSelectedItemChanged() { super.onSelectedItemChanged(); updateActionAvailability(); } @Override - protected void selectedItemsChanged() - { + protected void selectedItemsChanged() { super.selectedItemsChanged(); updateActionAvailability(); } - protected void updateItems() - { - } - - private void updateActionAvailability() - { + private void updateActionAvailability() { getRestoreCommand().setIsExecutionAllowed(getEntity() != null && getSelectedItems() != null && getSelectedItems().size() > 0 && getEntity().getStorageDomainSharedStatus() == StorageDomainSharedStatus.Active); @@ -148,25 +121,26 @@ } @Override - public void executeCommand(UICommand command) - { + public void executeCommand(UICommand command) { super.executeCommand(command); - if (command == getRestoreCommand()) - { + if (command == getRestoreCommand()) { restore(); + return; } - else if (command == getRemoveCommand()) - { + + if (command == getRemoveCommand()) { remove(); + return; } - else if ("Cancel".equals(command.getName())) //$NON-NLS-1$ - { + + switch (command.getName()) { + case CANCEL_COMMAND: cancel(); - } - else if ("CancelConfirm".equals(command.getName())) //$NON-NLS-1$ - { + break; + case CANCEL_CONFIRMATION_COMMAND: cancelConfirm(); + break; } } } 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 5f81c59..6d08d4f 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 @@ -43,6 +43,8 @@ import org.ovirt.engine.ui.uicompat.FrontendMultipleActionAsyncResult; import org.ovirt.engine.ui.uicompat.IFrontendMultipleActionAsyncCallback; import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; +import org.ovirt.engine.ui.uicompat.UIConstants; +import org.ovirt.engine.ui.uicompat.UIMessages; import org.ovirt.engine.ui.uicompat.external.StringUtils; import com.google.inject.Inject; @@ -53,10 +55,13 @@ private ArrayList<Map.Entry<VmTemplate, List<DiskImage>>> extendedItems; private StoragePool pool; + private static UIConstants constants = ConstantsManager.getInstance().getConstants(); + private static UIMessages messages = ConstantsManager.getInstance().getMessages(); + @Inject public TemplateBackupModel(Provider<ImportTemplateModel> importModelProvider) { setModelProvider(importModelProvider); - setTitle(ConstantsManager.getInstance().getConstants().templateImportTitle()); + setTitle(constants.templateImportTitle()); setHelpTag(HelpTag.template_import); setHashName("template_import"); //$NON-NLS-1$ } @@ -75,7 +80,7 @@ ConfirmationModel model = new ConfirmationModel(); setConfirmWindow(model); - model.setTitle(ConstantsManager.getInstance().getConstants().removeBackedUpTemplatesTitle()); + model.setTitle(constants.removeBackedUpTemplatesTitle()); model.setHelpTag(HelpTag.remove_backed_up_template); model.setHashName("remove_backed_up_template"); //$NON-NLS-1$ ArrayList<String> items = new ArrayList<String>(); @@ -86,12 +91,10 @@ } model.setItems(items); - model.setNote(ConstantsManager.getInstance().getConstants().noteTheDeletedItemsMightStillAppearOntheSubTab()); + model.setNote(constants.noteTheDeletedItemsMightStillAppearOntheSubTab()); - UICommand tempVar = UICommand.createDefaultOkUiCommand("OnRemove", this); //$NON-NLS-1$ - model.getCommands().add(tempVar); - UICommand tempVar2 = UICommand.createCancelUiCommand("Cancel", this); //$NON-NLS-1$ - model.getCommands().add(tempVar2); + model.getCommands().add(UICommand.createDefaultOkUiCommand("OnRemove", this)); //$NON-NLS-1$ + model.getCommands().add(UICommand.createCancelUiCommand(CANCEL_COMMAND, this)); } private void onRemove() { @@ -142,31 +145,21 @@ for (Map.Entry<String, List<String>> templateName : problematicVmNames.entrySet()) { List<String> vms = problematicVmNames.get(templateName.getKey()); String vmsListString = StringUtils.join(vms, ", "); //$NON-NLS-1$ - missingTemplatesFromVms.add(ConstantsManager.getInstance() - .getMessages() - .templatesWithDependentVMs(templateName.getKey(), vmsListString)); + missingTemplatesFromVms.add(messages.templatesWithDependentVMs(templateName.getKey(), vmsListString)); } setConfirmWindow(null); ConfirmationModel confirmModel = new ConfirmationModel(); setConfirmWindow(confirmModel); - confirmModel.setTitle(ConstantsManager.getInstance() - .getConstants() - .removeBackedUpTemplatesWithDependentsVMTitle()); + confirmModel.setTitle(constants.removeBackedUpTemplatesWithDependentsVMTitle()); confirmModel.setHelpTag(HelpTag.remove_backed_up_template); confirmModel.setHashName("remove_backed_up_template"); //$NON-NLS-1$ - confirmModel.setMessage(ConstantsManager.getInstance() - .getConstants() - .theFollowingTemplatesHaveDependentVmsBackupOnExportDomainMsg()); + confirmModel.setMessage(constants.theFollowingTemplatesHaveDependentVmsBackupOnExportDomainMsg()); confirmModel.setItems(missingTemplatesFromVms); - UICommand removeTemplateUiCommand = - UICommand.createDefaultOkUiCommand("RemoveVmTemplates", this); //$NON-NLS-1$ - confirmModel.getCommands().add(removeTemplateUiCommand); - UICommand cancelConfirmationUiCommand = - UICommand.createCancelUiCommand("CancelConfirmation", this); //$NON-NLS-1$ - confirmModel.getCommands().add(cancelConfirmationUiCommand); + confirmModel.getCommands().add(UICommand.createDefaultOkUiCommand("RemoveVmTemplates", this)); //$NON-NLS-1$ + confirmModel.getCommands().add(UICommand.createCancelUiCommand(CANCEL_CONFIRMATION_COMMAND, this)); } private HashMap<String, List<String>> getDependentVMsForTemplates(List<VM> vmsInExportDomain, @@ -188,10 +181,6 @@ } } return problematicVmNames; - } - - private void cancelConfirmation() { - setConfirmWindow(null); } private void removeTemplateBackup() { @@ -241,16 +230,12 @@ @Override protected String getAlreadyAssignedClonedNameMessage() { - return ConstantsManager.getInstance() - .getMessages() - .alreadyAssignedClonedTemplateName(); + return messages.alreadyAssignedClonedTemplateName(); } @Override protected String getSuffixCauseToClonedNameCollisionMessage(String existingName) { - return ConstantsManager.getInstance() - .getMessages() - .suffixCauseToClonedTemplateNameCollision(existingName); + return messages.suffixCauseToClonedTemplateNameCollision(existingName); } @Override @@ -340,19 +325,15 @@ if (toShowConfirmWindow) { ConfirmationModel confirmModel = new ConfirmationModel(); templateBackupModel.setConfirmWindow(confirmModel); - confirmModel.setTitle(ConstantsManager.getInstance() - .getConstants() - .importTemplatesTitle()); + confirmModel.setTitle(constants.importTemplatesTitle()); confirmModel.setHelpTag(HelpTag.import_template); confirmModel.setHashName("import_template"); //$NON-NLS-1$ - confirmModel.setMessage(ConstantsManager.getInstance() - .getMessages() - .importProcessHasBegunForTemplates(StringHelper.trimEnd(importedTemplates.toString().trim(), ','))); - UICommand tempVar = new UICommand("CancelConfirm", templateBackupModel); //$NON-NLS-1$ - tempVar.setTitle(ConstantsManager.getInstance().getConstants().close()); - tempVar.setIsDefault(true); - tempVar.setIsCancel(true); - confirmModel.getCommands().add(tempVar); + confirmModel.setMessage(messages.importProcessHasBegunForTemplates(StringHelper.trimEnd(importedTemplates.toString().trim(), ','))); + confirmModel.getCommands().add(new UICommand(CANCEL_CONFIRMATION_COMMAND, templateBackupModel) //$NON-NLS-1$ + .setTitle(constants.close()) + .setIsDefault(true) + .setIsCancel(true) + ); } } @@ -416,10 +397,9 @@ TemplateBackupModel.this.extendedItems = items; } }; - GetAllFromExportDomainQueryParameters tempVar = - new GetAllFromExportDomainQueryParameters(dataCenter.getId(), backupModel.getEntity() - .getId()); - Frontend.getInstance().runQuery(VdcQueryType.GetTemplatesFromExportDomain, tempVar, _asyncQuery1); + Frontend.getInstance().runQuery(VdcQueryType.GetTemplatesFromExportDomain, + new GetAllFromExportDomainQueryParameters(dataCenter.getId(), + backupModel.getEntity().getId()), _asyncQuery1); } } }; @@ -436,21 +416,17 @@ @Override public void executeCommand(UICommand command) { - if ("OnRemove".equals(command.getName())) //$NON-NLS-1$ - { + switch (command.getName()) { + case "OnRemove": //$NON-NLS-1$ onRemove(); - } - else if ("OnRestore".equals(command.getName())) //$NON-NLS-1$ - { + break; + case "OnRestore": //$NON-NLS-1$ onRestore(); - } - else if ("CancelConfirmation".equals(command.getName())) { //$NON-NLS-1$ - cancelConfirmation(); - } - else if ("RemoveVmTemplates".equals(command.getName())) { //$NON-NLS-1$ + break; + case "RemoveVmTemplates": //$NON-NLS-1$ removeTemplateBackup(); - } - else { + break; + default: super.executeCommand(command); } } @@ -462,7 +438,7 @@ @Override protected String getImportConflictTitle() { - return ConstantsManager.getInstance().getConstants().importTemplateConflictTitle(); + return constants.importTemplateConflictTitle(); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java index 67187fe..7db71ef 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java @@ -100,8 +100,6 @@ @Override protected void remove() { - super.remove(); - if (getWindow() != null) { return; } @@ -121,10 +119,8 @@ model.setNote(ConstantsManager.getInstance().getConstants().noteTheDeletedItemsMightStillAppearOntheSubTab()); - UICommand tempVar = UICommand.createDefaultOkUiCommand("OnRemove", this); //$NON-NLS-1$ - model.getCommands().add(tempVar); - UICommand tempVar2 = UICommand.createCancelUiCommand("Cancel", this); //$NON-NLS-1$ - model.getCommands().add(tempVar2); + model.getCommands().add(UICommand.createDefaultOkUiCommand("OnRemove", this)); //$NON-NLS-1$ + model.getCommands().add(UICommand.createCancelUiCommand(CANCEL_COMMAND, this)); //$NON-NLS-1$ } private void onRemove() { @@ -184,8 +180,6 @@ @Override protected void restore() { - super.restore(); - if (getWindow() != null) { return; } @@ -227,20 +221,17 @@ model.setEntity(getEntity().getId()); setWindow(model); model.startProgress(null); - UICommand restoreCommand; - restoreCommand = UICommand.createDefaultOkUiCommand("OnRestore", this); //$NON-NLS-1$ - model.getCommands().add(restoreCommand); - UICommand tempVar3 = UICommand.createCancelUiCommand("Cancel", this); //$NON-NLS-1$ - model.getCommands().add(tempVar3); + model.getCommands().add(UICommand.createDefaultOkUiCommand("OnRestore", this)); //$NON-NLS-1$ + model.getCommands().add(UICommand.createCancelUiCommand(CANCEL_COMMAND, this)); //$NON-NLS-1$); model.init(getSelectedItems(), getEntity().getId()); model.setTargetArchitecture(firstArch); // Add 'Close' command - UICommand closeCommand = new UICommand("Cancel", this); //$NON-NLS-1$ - closeCommand.setTitle(ConstantsManager.getInstance().getConstants().close()); - closeCommand.setIsDefault(true); - closeCommand.setIsCancel(true); - model.setCloseCommand(closeCommand); + model.setCloseCommand(new UICommand(CANCEL_COMMAND, this) //$NON-NLS-1$ + .setTitle(ConstantsManager.getInstance().getConstants().close()) + .setIsDefault(true) + .setIsCancel(true) + ); } public void onRestore() { @@ -451,12 +442,11 @@ confirmModel.setMessage(ConstantsManager.getInstance() .getMessages() .importProcessHasBegunForVms(StringHelper.trimEnd(importedVms.toString().trim(), ','))); - UICommand tempVar2 = new UICommand("CancelConfirm", //$NON-NLS-1$ - VmBackupModel.this); - tempVar2.setTitle(ConstantsManager.getInstance().getConstants().close()); - tempVar2.setIsDefault(true); - tempVar2.setIsCancel(true); - confirmModel.getCommands().add(tempVar2); + confirmModel.getCommands().add(new UICommand(CANCEL_CONFIRMATION_COMMAND, VmBackupModel.this) + .setTitle(ConstantsManager.getInstance().getConstants().close()) + .setIsDefault(true) + .setIsCancel(true) + ); } } @@ -504,11 +494,9 @@ setItems((ArrayList) vms); } }; - GetAllFromExportDomainQueryParameters tempVar = new GetAllFromExportDomainQueryParameters( - dataCenter.getId(), backupModel.getEntity() - .getId()); Frontend.getInstance().runQuery(VdcQueryType.GetVmsFromExportDomain, - tempVar, _asyncQuery1); + new GetAllFromExportDomainQueryParameters(dataCenter.getId(), + backupModel.getEntity().getId()), _asyncQuery1); } } }; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java index d59454d..c36ce38 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java @@ -55,27 +55,28 @@ setDetailModels(list); } - @Override - public void setItems(final Collection<?> value, final Guid storageDomainId) - { + private String createSearchPattern(Collection<VmTemplate> templates) { String vmt_guidKey = "_VMT_ID ="; //$NON-NLS-1$ String orKey = " or "; //$NON-NLS-1$ StringBuilder searchPattern = new StringBuilder(); searchPattern.append("Template: "); //$NON-NLS-1$ - final List<VmTemplate> list = (List<VmTemplate>) value; - for (int i = 0; i < list.size(); i++) { - VmTemplate vmTemplate = list.get(i); - + for (VmTemplate template : templates) { searchPattern.append(vmt_guidKey); - searchPattern.append(vmTemplate.getId().toString()); - if (i < list.size() - 1) { - searchPattern.append(orKey); - } + searchPattern.append(template.getId().toString()); + searchPattern.append(orKey); } + return searchPattern.substring(0, searchPattern.length() - orKey.length()); + } + + @Override + public void setItems(final Collection<?> value, final Guid storageDomainId) + { + @SuppressWarnings({ "unchecked", "rawtypes" }) + final List<VmTemplate> externalTemplates = (List<VmTemplate>) new ArrayList(value); Frontend.getInstance().runQuery(VdcQueryType.Search, - new SearchParameters(searchPattern.toString(), SearchType.VmTemplate), + new SearchParameters(createSearchPattern(externalTemplates), SearchType.VmTemplate), new AsyncQuery(this, new INewAsyncCallback() { @Override @@ -84,7 +85,7 @@ (List<VmTemplate>) ((VdcQueryReturnValue) returnValue).getReturnValue(); List<ImportTemplateData> templateDataList = new ArrayList<ImportTemplateData>(); - for (VmTemplate template : (Iterable<VmTemplate>) value) { + for (VmTemplate template : externalTemplates) { ImportTemplateData templateData = new ImportTemplateData(template); boolean templateExistsInSystem = vmtList.contains(template); templateData.setExistsInSystem(templateExistsInSystem); -- To view, visit https://gerrit.ovirt.org/40446 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea29951e644e205a959df83940ca0989f427d82f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
