Tal Nisan has uploaded a new change for review. Change subject: findbugs: Fix fingbugs errors in SanStorageModel class ......................................................................
findbugs: Fix fingbugs errors in SanStorageModel class Change-Id: I9e2f1f7f1a258c1bb3db1cef9f681e450a68a29e 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/StorageListModel.java 2 files changed, 24 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/14459/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 dfdf479..aec8310 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 @@ -45,7 +45,7 @@ if (isGrouppedByTarget != value) { isGrouppedByTarget = value; - IsGrouppedByTargetChanged(); + isGrouppedByTargetChanged(); onPropertyChanged(new PropertyChangedEventArgs("IsGrouppedByTarget")); //$NON-NLS-1$ } } @@ -95,7 +95,7 @@ includedLUNs = new ArrayList<LunModel>(); lastDiscoveredTargets = new ArrayList<SanTargetModel>(); - InitializeItems(null, null); + initializeItems(null, null); } @Override @@ -103,7 +103,7 @@ { super.postDiscoverTargets(newItems); - InitializeItems(null, newItems); + initializeItems(null, newItems); // Remember all discovered targets. lastDiscoveredTargets.clear(); @@ -130,12 +130,12 @@ VDS host = (VDS) getContainer().getHost().getSelectedItem(); if (host == null) { - ProposeDiscover(); + proposeDiscover(); return; } - ClearItems(); - InitializeItems(null, null); + clearItems(); + initializeItems(null, null); AsyncQuery asyncQuery = new AsyncQuery(this, new INewAsyncCallback() { @Override @@ -143,7 +143,7 @@ SanStorageModel model = (SanStorageModel) target; VdcQueryReturnValue response = (VdcQueryReturnValue) returnValue; if (response.getSucceeded()) { - model.ApplyData((ArrayList<LUNs>) response.getReturnValue(), false); + model.applyData((ArrayList<LUNs>) response.getReturnValue(), false); model.setGetLUNsFailure(""); //$NON-NLS-1$ } else { @@ -158,7 +158,7 @@ asyncQuery); } - private void ClearItems() + private void clearItems() { if (getItems() == null) { @@ -217,7 +217,7 @@ /** * Creates model items from the provided list of business entities. */ - public void ApplyData(List<LUNs> source, boolean isIncluded) + public void applyData(List<LUNs> source, boolean isIncluded) { ArrayList<LunModel> newItems = new ArrayList<LunModel>(); @@ -263,7 +263,7 @@ newItems.add(lunModel); // Update isGrayedOut and grayedOutReason properties - UpdateGrayedOut(lunModel); + updateGrayedOut(lunModel); // Remember included LUNs to prevent their removal while updating items. if (isIncluded) @@ -273,11 +273,11 @@ } } - InitializeItems(newItems, null); - ProposeDiscover(); + initializeItems(newItems, null); + proposeDiscover(); } - private void UpdateGrayedOut(LunModel lunModel) { + private void updateGrayedOut(LunModel lunModel) { Constants constants = ConstantsManager.getInstance().getConstants(); Messages messages = ConstantsManager.getInstance().getMessages(); @@ -303,16 +303,16 @@ } } - private void IsGrouppedByTargetChanged() + private void isGrouppedByTargetChanged() { - InitializeItems(null, null); + initializeItems(null, null); } /** * Organizes items according to the current groupping flag. When new items provided takes them in account and add to * the Items collection. */ - private void InitializeItems(List<LunModel> newLuns, List<SanTargetModel> newTargets) + private void initializeItems(List<LunModel> newLuns, List<SanTargetModel> newTargets) { if (getIsGrouppedByTarget()) { @@ -326,7 +326,7 @@ // Convert to list of another type as neccessary. if (!isTargetModelList) { - setItems(ToTargetModelList((List<LunModel>) getItems())); + setItems(toTargetModelList((List<LunModel>) getItems())); } } @@ -348,7 +348,7 @@ // Merge luns into targets. if (newLuns != null) { - MergeLunsToTargets(newLuns, items); + mergeLunsToTargets(newLuns, items); } setItems(items); @@ -367,7 +367,7 @@ // Convert to list of another type as neccessary. if (isTargetModelList) { - setItems(ToLunModelList((List<SanTargetModel>) getItems())); + setItems(toLunModelList((List<SanTargetModel>) getItems())); } } @@ -408,7 +408,7 @@ } } - private void MergeLunsToTargets(List<LunModel> newLuns, List<SanTargetModel> targets) + private void mergeLunsToTargets(List<LunModel> newLuns, List<SanTargetModel> targets) { for (LunModel lun : newLuns) { @@ -483,7 +483,7 @@ } }; - private List<SanTargetModel> ToTargetModelList(List<LunModel> source) + private List<SanTargetModel> toTargetModelList(List<LunModel> source) { ObservableCollection<SanTargetModel> list = new ObservableCollection<SanTargetModel>(); @@ -519,7 +519,7 @@ return list; } - private List<LunModel> ToLunModelList(List<SanTargetModel> source) + private List<LunModel> toLunModelList(List<SanTargetModel> source) { ObservableCollection<LunModel> list = new ObservableCollection<LunModel>(); @@ -546,7 +546,7 @@ return list; } - private void ProposeDiscover() + private void proposeDiscover() { boolean proposeDiscover = !getProposeDiscoverTargets() && (getItems() == null || Linq.count(getItems()) == 0); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java index 43614a9..747bbdb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java @@ -614,7 +614,7 @@ public void onSuccess(Object target, Object returnValue) { SanStorageModel sanStorageModel = (SanStorageModel) target; ArrayList<LUNs> lunList = (ArrayList<LUNs>) returnValue; - sanStorageModel.ApplyData(lunList, true); + sanStorageModel.applyData(lunList, true); } }, storageModel.getHash()), storage.getStorage(), hostId); } -- To view, visit http://gerrit.ovirt.org/14459 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e2f1f7f1a258c1bb3db1cef9f681e450a68a29e 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
