Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix fingbugs error in SanStorageModelBase class ......................................................................
findbugs: Fix fingbugs error in SanStorageModelBase class Change-Id: Icbeb62215591b5fb2892e23c5dc6dc6a3b36dd46 Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java 2 files changed, 30 insertions(+), 32 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/14457/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModel.java index d378c07..71b3ea9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModel.java @@ -99,9 +99,9 @@ } @Override - protected void PostDiscoverTargets(ArrayList<SanTargetModel> newItems) + protected void postDiscoverTargets(ArrayList<SanTargetModel> newItems) { - super.PostDiscoverTargets(newItems); + super.postDiscoverTargets(newItems); InitializeItems(null, newItems); @@ -111,17 +111,17 @@ } @Override - protected void Update() + protected void update() { lastDiscoveredTargets.clear(); - super.Update(); + super.update(); } @Override - protected void UpdateInternal() + protected void updateInternal() { - super.UpdateInternal(); + super.updateInternal(); if (!(getContainer().isNewStorage() || getContainer().isStorageActive())) { return; @@ -353,7 +353,7 @@ setItems(items); - UpdateLoginAllAvailability(); + updateLoginAllAvailability(); } else { @@ -555,7 +555,7 @@ } @Override - protected void IsAllLunsSelectedChanged() + protected void isAllLunsSelectedChanged() { if (!getIsGrouppedByTarget()) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java index 770ff14..f3f9be2 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanStorageModelBase.java @@ -9,9 +9,9 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.businessentities.StorageDomainType; +import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; -import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.queries.DiscoverSendTargetsQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -193,7 +193,7 @@ if (isAllLunsSelected != value) { isAllLunsSelected = value; - IsAllLunsSelectedChanged(); + isAllLunsSelectedChanged(); onPropertyChanged(new PropertyChangedEventArgs("IsAllLunsSelected")); //$NON-NLS-1$ } } @@ -258,8 +258,6 @@ privateHash = value; } - public boolean loginAllInProgress; - public SanTargetModel sanTargetModel; private ArrayList<SanTargetModel> targetsToConnect; protected SanStorageModelBase() @@ -287,7 +285,7 @@ setUseUserAuth(tempVar3); getUseUserAuth().getEntityChangedEvent().addListener(this); - UpdateUserAuthFields(); + updateUserAuthFields(); } @Override @@ -348,7 +346,7 @@ } if (sanStorageModel.targetsToConnect.isEmpty()) { - sanStorageModel.UpdateInternal(); + sanStorageModel.updateInternal(); } } @@ -401,7 +399,7 @@ connectTargets(); } - private void LoginAll() + private void loginAll() { // Cast to list of SanTargetModel because we get call // to this method only from target/LUNs mode. @@ -419,9 +417,9 @@ connectTargets(); } - private void DiscoverTargets() + private void discoverTargets() { - if (!ValidateDiscoverTargetFields()) + if (!validateDiscoverTargetFields()) { return; } @@ -445,7 +443,7 @@ public void onSuccess(Object target, Object returnValue) { SanStorageModelBase model = (SanStorageModelBase) target; Object result = ((VdcQueryReturnValue) returnValue).getReturnValue(); - model.PostDiscoverTargetsInternal(result != null ? (ArrayList<StorageServerConnections>) result + model.postDiscoverTargetsInternal(result != null ? (ArrayList<StorageServerConnections>) result : new ArrayList<StorageServerConnections>()); } }, true); @@ -453,7 +451,7 @@ Frontend.RunQuery(VdcQueryType.DiscoverSendTargets, parameters, asyncQuery); } - private void PostDiscoverTargetsInternal(ArrayList<StorageServerConnections> items) + private void postDiscoverTargetsInternal(ArrayList<StorageServerConnections> items) { ArrayList<SanTargetModel> newItems = new ArrayList<SanTargetModel>(); @@ -475,14 +473,14 @@ setMessage(ConstantsManager.getInstance().getConstants().noNewDevicesWereFoundMsg()); } - PostDiscoverTargets(newItems); + postDiscoverTargets(newItems); } - protected void PostDiscoverTargets(ArrayList<SanTargetModel> newItems) + protected void postDiscoverTargets(ArrayList<SanTargetModel> newItems) { } - private boolean ValidateDiscoverTargetFields() + private boolean validateDiscoverTargetFields() { getContainer().getHost().validateSelectedItem(new NotEmptyValidation[] { new NotEmptyValidation() }); @@ -511,10 +509,10 @@ private void UseUserAuth_EntityChanged(Object sender, EventArgs args) { - UpdateUserAuthFields(); + updateUserAuthFields(); } - private void UpdateUserAuthFields() + private void updateUserAuthFields() { getUserName().setIsValid(true); getUserName().setIsChangable((Boolean) getUseUserAuth().getEntity()); @@ -530,29 +528,29 @@ if (command == getUpdateCommand()) { - Update(); + update(); } else if (command == getLoginAllCommand()) { - LoginAll(); + loginAll(); } else if (command == getDiscoverTargetsCommand()) { - DiscoverTargets(); + discoverTargets(); } } - protected void Update() + protected void update() { - UpdateInternal(); + updateInternal(); setIsValid(true); } - protected void UpdateInternal() + protected void updateInternal() { } - protected void UpdateLoginAllAvailability() + protected void updateLoginAllAvailability() { List<SanTargetModel> items = (List<SanTargetModel>) getItems(); @@ -571,7 +569,7 @@ getLoginAllCommand().setIsExecutionAllowed(allow); } - protected void IsAllLunsSelectedChanged() + protected void isAllLunsSelectedChanged() { } } -- To view, visit http://gerrit.ovirt.org/14457 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icbeb62215591b5fb2892e23c5dc6dc6a3b36dd46 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
