Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix fingbugs error in StorageDataCenterListModel class ......................................................................
findbugs: Fix fingbugs error in StorageDataCenterListModel class Change-Id: I02c4c364d9bb42728fb8b024dc66a5456c0053de Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java 1 file changed, 51 insertions(+), 42 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/55/14455/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java index 647d620..e9e71f1 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java @@ -1,18 +1,21 @@ package org.ovirt.engine.ui.uicommonweb.models.storage; +import java.util.ArrayList; +import java.util.List; + import org.ovirt.engine.core.common.VdcActionUtils; import org.ovirt.engine.core.common.action.DetachStorageDomainFromPoolParameters; import org.ovirt.engine.core.common.action.RemoveStorageDomainParameters; 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.StorageDomainType; +import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; 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.StorageDomainQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -32,9 +35,6 @@ import org.ovirt.engine.ui.uicompat.FrontendMultipleActionAsyncResult; import org.ovirt.engine.ui.uicompat.IFrontendMultipleActionAsyncCallback; import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; - -import java.util.ArrayList; -import java.util.List; @SuppressWarnings("unused") public class StorageDataCenterListModel extends SearchableListModel @@ -172,7 +172,7 @@ setActivateCommand(new UICommand("Activate", this)); //$NON-NLS-1$ setMaintenanceCommand(new UICommand("Maintenance", this)); //$NON-NLS-1$ - UpdateActionAvailability(); + updateActionAvailability(); } @Override @@ -181,7 +181,7 @@ super.onEntityChanged(); getSearchCommand().Execute(); - UpdateActionAvailability(); + updateActionAvailability(); } @Override @@ -238,7 +238,7 @@ setItems(getAsyncResult().getData()); } - private void Attach() + private void attach() { if (getWindow() != null) { @@ -266,7 +266,7 @@ && (dataCenter.getStoragePoolFormatType() == null || dataCenter.getStoragePoolFormatType() == getEntity().getStorageStaticData() .getStorageFormat()) && dataCenter.getstorage_pool_type() == getEntity().getStorageType(); - AddToAttachCandidateDatacenters(dataCenter, addDatacenter); + addToAttachCandidateDatacenters(dataCenter, addDatacenter); break; case ISO: AsyncDataProvider.GetIsoDomainByDataCenterId(new AsyncQuery(new Object[] { listModel, @@ -282,7 +282,7 @@ boolean addDatacenter1 = dataCenter1.getstatus() == StoragePoolStatus.Up && returnValue1 == null; - listModel1.AddToAttachCandidateDatacenters(dataCenter1, addDatacenter1); + listModel1.addToAttachCandidateDatacenters(dataCenter1, addDatacenter1); } }), @@ -302,11 +302,15 @@ boolean addDatacenter2 = dataCenter2.getstatus() == StoragePoolStatus.Up && returnValue2 == null; - listModel2.AddToAttachCandidateDatacenters(dataCenter2, addDatacenter2); + listModel2.addToAttachCandidateDatacenters(dataCenter2, addDatacenter2); } }), dataCenter.getId()); + break; + default: + // Should never happen and even if so there is not much to do about it since the new + // data center type is not handled yet anyway break; } } @@ -315,7 +319,7 @@ })); } - public void AddToAttachCandidateDatacenters(StoragePool dataCenter, boolean addDatacenter) + public void addToAttachCandidateDatacenters(StoragePool dataCenter, boolean addDatacenter) { // Add a new datacenter EntityModel EntityModel dcEntityModel = new EntityModel(); @@ -341,10 +345,10 @@ } } - PostAttachInit(datacenters); + postAttachInit(datacenters); } - public void PostAttachInit(ArrayList<EntityModel> datacenters) + public void postAttachInit(ArrayList<EntityModel> datacenters) { ListModel model = new ListModel(); setWindow(model); @@ -376,7 +380,7 @@ } } - private void OnAttach() + private void onAttach() { ListModel model = (ListModel) getWindow(); @@ -387,7 +391,7 @@ if (getEntity() == null) { - Cancel(); + cancel(); return; } @@ -418,18 +422,18 @@ ListModel localModel = (ListModel) result.getState(); localModel.StopProgress(); - Cancel(); + cancel(); } }, model); } else { - Cancel(); + cancel(); } } - private void Detach() + private void detach() { if (getWindow() != null) { @@ -450,12 +454,12 @@ } model.setItems(items); - 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$ @@ -468,20 +472,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())) { @@ -493,7 +502,7 @@ return false; } - private void OnDetach() + private void onDetach() { ConfirmationModel model = (ConfirmationModel) getWindow(); @@ -554,10 +563,10 @@ } } - Cancel(); + cancel(); } - private void Maintenance() + private void maintenance() { ArrayList<VdcActionParametersBase> list = new ArrayList<VdcActionParametersBase>(); for (Object item : getSelectedItems()) @@ -583,7 +592,7 @@ }, null); } - private void Activate() + private void activate() { ArrayList<VdcActionParametersBase> list = new ArrayList<VdcActionParametersBase>(); for (Object item : getSelectedItems()) @@ -609,7 +618,7 @@ }, null); } - private void Cancel() + private void cancel() { setWindow(null); } @@ -618,14 +627,14 @@ protected void onSelectedItemChanged() { super.onSelectedItemChanged(); - UpdateActionAvailability(); + updateActionAvailability(); } @Override protected void selectedItemsChanged() { super.selectedItemsChanged(); - UpdateActionAvailability(); + updateActionAvailability(); } @Override @@ -635,11 +644,11 @@ if (e.PropertyName.equals("status")) //$NON-NLS-1$ { - UpdateActionAvailability(); + updateActionAvailability(); } } - private void UpdateActionAvailability() + private void updateActionAvailability() { ArrayList<StorageDomain> items = getSelectedItems() != null ? Linq.<StorageDomain> cast(getSelectedItems()) @@ -665,31 +674,31 @@ if (command == getAttachCommand()) { - Attach(); + attach(); } 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/14455 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I02c4c364d9bb42728fb8b024dc66a5456c0053de 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
