Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix fingbugs error in frontend backup models ......................................................................
findbugs: Fix fingbugs error in frontend backup models Fixed findbugs errors in ManageBackupModel, TemplateBackupModel and VmBackupModel classes Change-Id: I74d71e32a52bd41bba78099401b4dfee79330aaa Signed-off-by: Tal Nisan <[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 3 files changed, 47 insertions(+), 46 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/14452/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 45cad99..5949d52 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 @@ -1,7 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.storage; -import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus; import org.ovirt.engine.core.common.businessentities.StorageDomain; +import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel; @@ -73,17 +73,17 @@ { } - protected void Restore() + protected void restore() { } - protected void Cancel() + protected void cancel() { - CancelConfirm(); + cancelConfirm(); setWindow(null); } - protected void CancelConfirm() + protected void cancelConfirm() { setConfirmWindow(null); } @@ -95,7 +95,7 @@ if (e.PropertyName.equals("storage_domain_shared_status")) //$NON-NLS-1$ { - CheckStorageStatus(); + checkStorageStatus(); } } @@ -104,13 +104,13 @@ { super.onEntityChanged(); - CheckStorageStatus(); - UpdateActionAvailability(); + checkStorageStatus(); + updateActionAvailability(); getSearchCommand().Execute(); } - private void CheckStorageStatus() + private void checkStorageStatus() { if (getEntity() != null) { @@ -134,21 +134,17 @@ protected void onSelectedItemChanged() { super.onSelectedItemChanged(); - UpdateActionAvailability(); + updateActionAvailability(); } @Override protected void selectedItemsChanged() { super.selectedItemsChanged(); - UpdateActionAvailability(); + updateActionAvailability(); } - protected void UpdateItems() - { - } - - private void UpdateActionAvailability() + private void updateActionAvailability() { getRestoreCommand().setIsExecutionAllowed(getEntity() != null && getSelectedItems() != null && getSelectedItems().size() > 0 @@ -166,7 +162,7 @@ if (command == getRestoreCommand()) { - Restore(); + restore(); } else if (command == getRemoveCommand()) { @@ -174,11 +170,11 @@ } else if (StringHelper.stringsEqual(command.getName(), "Cancel")) //$NON-NLS-1$ { - Cancel(); + cancel(); } else if (StringHelper.stringsEqual(command.getName(), "CancelConfirm")) //$NON-NLS-1$ { - CancelConfirm(); + cancelConfirm(); } } } 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 331df36..3be590a 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 @@ -14,9 +14,9 @@ import org.ovirt.engine.core.common.businessentities.Quota; import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainType; +import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VmTemplate; -import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.queries.DiskImageList; import org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; @@ -88,7 +88,7 @@ model.getCommands().add(tempVar2); } - private void OnRemove() + private void onRemove() { AsyncDataProvider.GetDataCentersByStorageDomain(new AsyncQuery(this, new INewAsyncCallback() { @@ -113,7 +113,7 @@ } }), getEntity().getId()); - Cancel(); + cancel(); } @Override @@ -225,20 +225,24 @@ TemplateBackupModel templateBackupModel = (TemplateBackupModel) result.getState(); templateBackupModel.getWindow().StopProgress(); - templateBackupModel.Cancel(); + templateBackupModel.cancel(); ArrayList<VdcReturnValueBase> retVals = (ArrayList<VdcReturnValueBase>) result.getReturnValue(); if (retVals != null && templateBackupModel.getSelectedItems().size() == retVals.size()) { - String importedTemplates = ""; //$NONNLS1$ + StringBuilder importedTemplatesBuilder = new StringBuilder(); int counter = 0; boolean toShowConfirmWindow = false; for (Object a : templateBackupModel.getSelectedItems()) { VmTemplate template = (VmTemplate) a; if (retVals.get(counter) != null && retVals.get(counter).getCanDoAction()) { - importedTemplates += template.getName() + ", "; //$NON-NLS-1$ + if (toShowConfirmWindow) { + importedTemplatesBuilder.append(", "); //$NON-NLS-1$ + } + + importedTemplatesBuilder.append(template.getName()); toShowConfirmWindow = true; } counter++; @@ -250,10 +254,9 @@ .getConstants() .importTemplatesTitle()); confirmModel.setHashName("import_template"); //$NON-NLS-1$ - importedTemplates = StringHelper.trimEnd(importedTemplates.trim(), ','); confirmModel.setMessage(ConstantsManager.getInstance() .getMessages() - .importProcessHasBegunForTemplates(importedTemplates)); + .importProcessHasBegunForTemplates(importedTemplatesBuilder.toString())); UICommand tempVar = new UICommand("CancelConfirm", templateBackupModel); //$NON-NLS-1$ tempVar.setTitle(ConstantsManager.getInstance().getConstants().close()); tempVar.setIsDefault(true); @@ -338,8 +341,8 @@ } @Override - protected void Restore() { - super.Restore(); + protected void restore() { + super.restore(); ((TemplateImportDiskListModel) ((ImportTemplateModel) getWindow()).getImportDiskListModel()).setExtendedItems(extendedItems); } @@ -355,11 +358,11 @@ { if (StringHelper.stringsEqual(command.getName(), "OnRemove")) //$NON-NLS-1$ { - OnRemove(); + onRemove(); } else if (StringHelper.stringsEqual(command.getName(), "OnRestore")) //$NON-NLS-1$ { - OnRestore(); + onRestore(); } else { super.executeCommand(command); } 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 be786f1..e834535 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 @@ -27,7 +27,6 @@ import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; @@ -117,7 +116,7 @@ model.getCommands().add(tempVar2); } - private void OnRemove() { + private void onRemove() { ConfirmationModel model = (ConfirmationModel) getWindow(); if (model.getProgress() != null) { @@ -154,7 +153,7 @@ ConfirmationModel localModel = (ConfirmationModel) result .getState(); localModel.StopProgress(); - Cancel(); + cancel(); onEntityChanged(); } @@ -167,8 +166,8 @@ } @Override - protected void Restore() { - super.Restore(); + protected void restore() { + super.restore(); if (getWindow() != null) { return; @@ -205,7 +204,7 @@ return model; } - public void OnRestore() { + public void onRestore() { importModel = (ImportVmModel) getWindow(); if (importModel.getProgress() != null) { @@ -440,21 +439,25 @@ VmBackupModel vmBackupModel = (VmBackupModel) result .getState(); vmBackupModel.getWindow().StopProgress(); - vmBackupModel.Cancel(); + vmBackupModel.cancel(); ArrayList<VdcReturnValueBase> retVals = (ArrayList<VdcReturnValueBase>) result .getReturnValue(); if (retVals != null && vmBackupModel.getSelectedItems().size() == retVals .size()) { - String importedVms = ""; //$NON-NLS-1$ + StringBuilder importedVmsBuilder = new StringBuilder(); int counter = 0; boolean toShowConfirmWindow = false; for (Object item : vmBackupModel.getSelectedItems()) { VM vm = (VM) item; if (retVals.get(counter) != null && retVals.get(counter).getCanDoAction()) { - importedVms += vm.getName() + ", "; //$NON-NLS-1$ + if (toShowConfirmWindow) { + importedVmsBuilder.append(", "); //$NON-NLS-1$ + } + + importedVmsBuilder.append(vm.getName()); toShowConfirmWindow = true; } counter++; @@ -468,10 +471,9 @@ .getConstants() .importVirtualMachinesTitle()); confirmModel.setHashName("import_virtual_machine"); //$NON-NLS-1$ - importedVms = StringHelper.trimEnd(importedVms.trim(), ','); confirmModel.setMessage(ConstantsManager.getInstance() .getMessages() - .importProcessHasBegunForVms(importedVms)); + .importProcessHasBegunForVms(importedVmsBuilder.toString())); UICommand tempVar2 = new UICommand("CancelConfirm", //$NON-NLS-1$ vmBackupModel); tempVar2.setTitle(ConstantsManager.getInstance().getConstants().close()); @@ -549,9 +551,9 @@ super.executeCommand(command); if (command.getName().equals("OnRemove")) { //$NON-NLS-1$ - OnRemove(); + onRemove(); } else if (command.getName().equals("OnRestore")) { //$NON-NLS-1$ - OnRestore(); + onRestore(); } else if (command.getName().equals("onClone")) { //$NON-NLS-1$ onClone(); } else if (command.getName().equals("closeClone")) { //$NON-NLS-1$ @@ -560,8 +562,8 @@ } @Override - protected final void Cancel() { - super.Cancel(); + protected final void cancel() { + super.cancel(); clearCachedAssignedVmNames(); } -- To view, visit http://gerrit.ovirt.org/14452 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I74d71e32a52bd41bba78099401b4dfee79330aaa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
