Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix fingbugs errors in DataCenterStorageListModel class ......................................................................
findbugs: Fix fingbugs errors in DataCenterStorageListModel class Also removed legacy comments that are not usefull anymore Change-Id: Id5d773b1c293ea83b7a042b0652a1860ce535e9a Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java 1 file changed, 53 insertions(+), 68 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/14485/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java index db9d6bc..9cad149 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java @@ -8,14 +8,14 @@ import org.ovirt.engine.core.common.action.StorageDomainPoolParametersBase; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StorageFormatType; +import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; -import org.ovirt.engine.core.common.businessentities.StorageDomain; -import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.queries.StoragePoolQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -175,7 +175,7 @@ setActivateCommand(new UICommand("Activate", this)); //$NON-NLS-1$ setMaintenanceCommand(new UICommand("Maintenance", this)); //$NON-NLS-1$ - UpdateActionAvailability(); + updateActionAvailability(); } @Override @@ -225,13 +225,8 @@ setItems(getAsyncResult().getData()); } - public void Maintenance() + public void maintenance() { - // Frontend.RunMultipleActions(VdcActionType.DeactivateStorageDomain, - // SelectedItems.Cast<storage_domains>() - // .Select(a => (VdcActionParametersBase)new StorageDomainPoolParametersBase(a.id, Entity.id)) - // .ToList() - // ); ArrayList<VdcActionParametersBase> pb = new ArrayList<VdcActionParametersBase>(); for (StorageDomain a : Linq.<StorageDomain> cast(getSelectedItems())) { @@ -241,13 +236,8 @@ Frontend.RunMultipleAction(VdcActionType.DeactivateStorageDomain, pb); } - public void Activate() + public void activate() { - // Frontend.RunMultipleActions(VdcActionType.ActivateStorageDomain, - // SelectedItems.Cast<storage_domains>() - // .Select(a => (VdcActionParametersBase)new StorageDomainPoolParametersBase(a.id, Entity.id)) - // .ToList() - // ); ArrayList<VdcActionParametersBase> pb = new ArrayList<VdcActionParametersBase>(); for (StorageDomain a : Linq.<StorageDomain> cast(getSelectedItems())) { @@ -257,28 +247,28 @@ Frontend.RunMultipleAction(VdcActionType.ActivateStorageDomain, pb); } - public void AttachBackup() + public void attachBackup() { - AttachInternal(StorageDomainType.ImportExport, ConstantsManager.getInstance() + attachInternal(StorageDomainType.ImportExport, ConstantsManager.getInstance() .getConstants() .attachExportDomainTitle(), "attach_export_domain"); //$NON-NLS-1$ } - public void AttachISO() + public void attachISO() { - AttachInternal(StorageDomainType.ISO, + attachInternal(StorageDomainType.ISO, ConstantsManager.getInstance().getConstants().attachISOLibraryTitle(), "attach_iso_library"); //$NON-NLS-1$ } - public void AttachStorage() + public void attachStorage() { - AttachInternal(StorageDomainType.Data, + attachInternal(StorageDomainType.Data, ConstantsManager.getInstance().getConstants().attachStorageTitle(), "attach_storage"); //$NON-NLS-1$ } - private void AttachInternal(StorageDomainType storageType, String title, String hashName) + private void attachInternal(StorageDomainType storageType, String title, String hashName) { if (getWindow() != null) { @@ -316,7 +306,7 @@ models.add(tempVar); } } - dcStorageModel.PostAttachInternal(models); + dcStorageModel.postAttachInternal(models); } }; @@ -397,7 +387,7 @@ } } } - dcStorageModel.PostAttachInternal(models); + dcStorageModel.postAttachInternal(models); } }; AsyncDataProvider.GetStorageDomainList(_asyncQuery); @@ -405,7 +395,7 @@ } - private void PostAttachInternal(ArrayList<EntityModel> models) + private void postAttachInternal(ArrayList<EntityModel> models) { ListModel listModel = (ListModel) getWindow(); listModel.setItems(models); @@ -435,21 +425,16 @@ } } - public void OnAttach() + public void onAttach() { ListModel model = (ListModel) getWindow(); if (getEntity() == null) { - Cancel(); + cancel(); return; } - // var items = model.Items - // .Cast<EntityModel>() - // .Where(Selector.GetIsSelected) - // .Select(a => (storage_domains)a.Entity) - // .ToList(); ArrayList<StorageDomain> items = new ArrayList<StorageDomain>(); for (EntityModel a : Linq.<EntityModel> cast(model.getItems())) { @@ -461,11 +446,6 @@ if (items.size() > 0) { - // Frontend.RunMultipleActions(VdcActionType.AttachStorageDomainToPool, - // items - // .Select(a => (VdcActionParametersBase)new StorageDomainPoolParametersBase(a.id, Entity.id)) - // .ToList() - // ); ArrayList<VdcActionParametersBase> pb = new ArrayList<VdcActionParametersBase>(); for (StorageDomain a : items) { @@ -475,10 +455,10 @@ Frontend.RunMultipleAction(VdcActionType.AttachStorageDomainToPool, pb); } - Cancel(); + cancel(); } - public void Detach() + public void detach() { if (getWindow() != null) { @@ -498,12 +478,12 @@ } model.setItems(list); - if (ContainsLocalStorage(model)) + if (containsLocalStorage(model)) { model.getLatch().setIsAvailable(true); model.getLatch().setIsChangable(true); - model.setNote(ConstantsManager.getInstance().getMessages().detachNote(GetLocalStoragesFormattedString())); + model.setNote(ConstantsManager.getInstance().getMessages().detachNote(getLocalStoragesFormattedString())); } UICommand tempVar = new UICommand("OnDetach", this); //$NON-NLS-1$ @@ -516,20 +496,25 @@ model.getCommands().add(tempVar2); } - private String GetLocalStoragesFormattedString() + private String getLocalStoragesFormattedString() { - String localStorages = ""; //$NON-NLS-1$ + StringBuilder localStoragesBuilder = new StringBuilder(); + boolean firstFound = false; for (StorageDomain a : Linq.<StorageDomain> cast(getSelectedItems())) { if (a.getStorageType() == StorageType.LOCALFS) { - localStorages += a.getStorageName() + ", "; //$NON-NLS-1$ + if (firstFound) { + localStoragesBuilder.append(", "); //$NON-NLS-1$ + } + localStoragesBuilder.append(a.getStorageName()); + firstFound = true; } } - return localStorages.substring(0, localStorages.length() - 2); + return localStoragesBuilder.toString(); } - private boolean ContainsLocalStorage(ConfirmationModel model) + private boolean containsLocalStorage(ConfirmationModel model) { for (StorageDomain a : Linq.<StorageDomain> cast(getSelectedItems())) { @@ -541,7 +526,7 @@ return false; } - public void OnDetach() + public void onDetach() { ConfirmationModel confirmModel = (ConfirmationModel) getWindow(); @@ -592,18 +577,18 @@ ((RemoveStorageDomainParameters) item).setDoFormat(true); } - dataCenterStorageListModel.PostDetach(dataCenterStorageListModel.getWindow()); + dataCenterStorageListModel.postDetach(dataCenterStorageListModel.getWindow()); } }; AsyncDataProvider.GetLocalStorageHost(_asyncQuery, localStorgaeDC); } else { - PostDetach(confirmModel); + postDetach(confirmModel); } } - public void PostDetach(Model model) + public void postDetach(Model model) { Frontend.RunMultipleAction(VdcActionType.RemoveStorageDomain, getpb_remove(), new IFrontendMultipleActionAsyncCallback() { @@ -621,7 +606,7 @@ ConfirmationModel localModel2 = (ConfirmationModel) result2.getState(); localModel2.stopProgress(); - Cancel(); + cancel(); } }, localModel1); @@ -630,7 +615,7 @@ }, new Object[] { model, getpb_detach() }); } - public void Cancel() + public void cancel() { setWindow(null); } @@ -639,28 +624,28 @@ protected void onSelectedItemChanged() { super.onSelectedItemChanged(); - UpdateActionAvailability(); + updateActionAvailability(); } @Override protected void selectedItemsChanged() { super.selectedItemsChanged(); - UpdateActionAvailability(); + updateActionAvailability(); } @Override protected void itemsCollectionChanged(Object sender, NotifyCollectionChangedEventArgs e) { super.itemsCollectionChanged(sender, e); - UpdateActionAvailability(); + updateActionAvailability(); } @Override protected void itemsChanged() { super.itemsChanged(); - UpdateActionAvailability(); + updateActionAvailability(); } @Override @@ -670,7 +655,7 @@ if (e.PropertyName.equals("status")) //$NON-NLS-1$ { - UpdateActionAvailability(); + updateActionAvailability(); } } @@ -681,7 +666,7 @@ if (e.PropertyName.equals("status")) //$NON-NLS-1$ { - UpdateActionAvailability(); + updateActionAvailability(); } } @@ -691,7 +676,7 @@ return true; } - private void UpdateActionAvailability() + private void updateActionAvailability() { ArrayList<StorageDomain> items = getItems() != null ? Linq.<StorageDomain> cast(getItems()) @@ -760,39 +745,39 @@ if (command == getAttachStorageCommand()) { - AttachStorage(); + attachStorage(); } else if (command == getAttachISOCommand()) { - AttachISO(); + attachISO(); } else if (command == getAttachBackupCommand()) { - AttachBackup(); + attachBackup(); } else if (command == getDetachCommand()) { - Detach(); + detach(); } else if (command == getActivateCommand()) { - Activate(); + activate(); } else if (command == getMaintenanceCommand()) { - Maintenance(); + maintenance(); } else if (StringHelper.stringsEqual(command.getName(), "OnAttach")) //$NON-NLS-1$ { - OnAttach(); + onAttach(); } else if (StringHelper.stringsEqual(command.getName(), "OnDetach")) //$NON-NLS-1$ { - OnDetach(); + onDetach(); } else if (StringHelper.stringsEqual(command.getName(), "Cancel")) //$NON-NLS-1$ { - Cancel(); + cancel(); } } -- To view, visit http://gerrit.ovirt.org/14485 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5d773b1c293ea83b7a042b0652a1860ce535e9a 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
