Tal Nisan has uploaded a new change for review.
Change subject: findbugs: Fix fingbugs error in StorageModel class
......................................................................
findbugs: Fix fingbugs error in StorageModel class
Change-Id: Id9281939079fa40e03170d3a2b0a43b348128a02
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java
4 files changed, 36 insertions(+), 30 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/14450/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
index 4572aca..c69b4ef 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
@@ -724,7 +724,7 @@
{
StorageModel model = (StorageModel) getWindow();
- if (!model.Validate())
+ if (!model.validate())
{
return;
}
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 c3cd066..43614a9 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
@@ -675,7 +675,7 @@
return;
}
- if (!model.Validate())
+ if (!model.validate())
{
return;
}
@@ -930,7 +930,7 @@
{
StorageModel model = (StorageModel) getWindow();
- if (!model.Validate())
+ if (!model.validate())
{
return;
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
index 195a339..2b750e2 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
@@ -12,13 +12,13 @@
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.StoragePoolStatus;
import org.ovirt.engine.core.common.businessentities.StorageType;
import org.ovirt.engine.core.common.businessentities.VDS;
import org.ovirt.engine.core.common.businessentities.VDSStatus;
import org.ovirt.engine.core.common.businessentities.VDSType;
import org.ovirt.engine.core.common.businessentities.VdsSpmStatus;
-import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.queries.ConfigurationValues;
import org.ovirt.engine.core.common.queries.SearchParameters;
@@ -79,7 +79,6 @@
privateStorage = value;
}
- public ArrayList<IStorageModel> UpdatedStorageModels = new
ArrayList<IStorageModel>();
private String privateOriginalName;
public String getOriginalName()
@@ -218,7 +217,7 @@
setHash(getHashName() + new Date());
behavior.setHash(getHash());
- InitDataCenter();
+ initDataCenter();
}
@Override
@@ -302,8 +301,8 @@
if (getSelectedItem() != null)
{
- UpdateFormat();
- UpdateHost();
+ updateFormat();
+ updateHost();
}
}
@@ -330,7 +329,7 @@
private void DataCenter_SelectedItemChanged()
{
- UpdateItemsAvailability();
+ updateItemsAvailability();
updateDataCenterAlert();
}
@@ -385,7 +384,7 @@
}
}
- private void InitDataCenter()
+ private void initDataCenter()
{
if (getSystemTreeSelectedItem() != null &&
getSystemTreeSelectedItem().getType() != SystemTreeItemType.System)
{
@@ -444,7 +443,7 @@
List<StoragePool> dataCenters =
(ArrayList<StoragePool>) returnValue;
dataCenters =
storageModelBehavior.FilterDataCenter(dataCenters);
-
StorageModel.AddEmptyDataCenterToList(dataCenters);
+
StorageModel.addEmptyDataCenterToList(dataCenters);
StoragePool oldSelectedItem =
(StoragePool)
storageModel.getDataCenter().getSelectedItem();
storageModel.getDataCenter().setItems(dataCenters);
@@ -478,7 +477,7 @@
(ArrayList<StoragePool>) returnValue;
if (dataCentersWithStorage.size() < 1 ||
dataCentersWithStorage.get(0) == null)
{
-
StorageModel.AddEmptyDataCenterToList(dataCenters);
+
StorageModel.addEmptyDataCenterToList(dataCenters);
}
else
{
@@ -496,7 +495,7 @@
}
}
- private static void AddEmptyDataCenterToList(List<StoragePool> dataCenters)
+ private static void addEmptyDataCenterToList(List<StoragePool> dataCenters)
{
StoragePool tempVar = new StoragePool();
tempVar.setId(UnassignedDataCenterId);
@@ -504,7 +503,7 @@
dataCenters.add(tempVar);
}
- void UpdateHost()
+ void updateHost()
{
if (getDataCenter().getItems() == null)
{
@@ -536,12 +535,17 @@
if (localDCList.size() > 0)
{
- int i = 0;
- for (; i < localDCList.size() - 1; i++)
+ StringBuilder queryLineBuilder = new StringBuilder();
+ for (int i = 0; i < localDCList.size(); i++)
{
- dataCenterQueryLine += "datacenter=" +
localDCList.get(i).getname() + " or "; //$NON-NLS-1$ //$NON-NLS-2$
+ if (i > 0) {
+ queryLineBuilder.append(" or "); //$NON-NLS-1$
+ }
+ queryLineBuilder.append("datacenter="); //$NON-NLS-1$
+ queryLineBuilder.append(localDCList.get(i).getname());
}
- dataCenterQueryLine += "datacenter=" +
localDCList.get(i).getname(); //$NON-NLS-1$
+
+ dataCenterQueryLine = queryLineBuilder.toString();
AsyncQuery _asyncQuery = new AsyncQuery();
_asyncQuery.setModel(this);
@@ -553,7 +557,7 @@
StorageModel storageModel = (StorageModel) model;
Iterable<VDS> hosts =
(ArrayList<VDS>) ((VdcQueryReturnValue)
ReturnValue).getReturnValue();
- storageModel.PostUpdateHost(hosts);
+ storageModel.postUpdateHost(hosts);
}
};
Frontend.RunQuery(VdcQueryType.Search, new
SearchParameters("Hosts: status=Up " + dataCenterQueryLine, //$NON-NLS-1$
@@ -571,7 +575,7 @@
StorageModel storageModel = (StorageModel)
target;
Iterable<VDS> hosts = (Iterable<VDS>)
returnValue;
- storageModel.PostUpdateHost(hosts);
+ storageModel.postUpdateHost(hosts);
}
}, getHash()));
}
@@ -584,7 +588,7 @@
StorageModel storageModel = (StorageModel)
target;
Iterable<VDS> hosts = (Iterable<VDS>)
returnValue;
- storageModel.PostUpdateHost(hosts);
+ storageModel.postUpdateHost(hosts);
}
}, getHash()), dataCenter.getId());
@@ -592,7 +596,7 @@
}
}
- public void PostUpdateHost(Iterable<VDS> hosts)
+ public void postUpdateHost(Iterable<VDS> hosts)
{
// Filter hosts
hosts = Linq.where(hosts, new Linq.HostStatusPredicate(VDSStatus.Up));
@@ -644,7 +648,7 @@
return null;
}
- void UpdateFormat()
+ void updateFormat()
{
StoragePool dataCenter = (StoragePool)
getDataCenter().getSelectedItem();
@@ -726,7 +730,7 @@
getFormat().setSelectedItem(selectItem);
}
- private void UpdateItemsAvailability()
+ private void updateItemsAvailability()
{
if (getItems() == null)
{
@@ -736,7 +740,7 @@
behavior.UpdateItemsAvailability();
}
- public boolean Validate() {
+ public boolean validate() {
ValidationResult result = new
NotEmptyValidation().validate(getHost().getSelectedItem());
if (!result.getSuccess()) {
getHost().setIsValid(false);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java
index f4d23c5..bf5d73c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java
@@ -3,8 +3,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.StoragePoolStatus;
import org.ovirt.engine.core.common.businessentities.StoragePool;
+import org.ovirt.engine.core.common.businessentities.StoragePoolStatus;
import org.ovirt.engine.core.compat.StringHelper;
import org.ovirt.engine.ui.frontend.Frontend;
import org.ovirt.engine.ui.uicommonweb.Linq;
@@ -16,6 +16,8 @@
public abstract class StorageModelBehavior extends Model
{
private StorageModel privateModel;
+
+ private ArrayList<IStorageModel> updatedStorageModels = new
ArrayList<IStorageModel>();
public StorageModel getModel()
{
@@ -71,12 +73,12 @@
public void OnStorageModelUpdated(IStorageModel model)
{
// Update models list (the list is used for checking update completion)
- getModel().UpdatedStorageModels.add(model);
+ updatedStorageModels.add(model);
// Filter UnSelectable model from AvailableStorageItems list
- if (getModel().UpdatedStorageModels.size() == Linq.<IStorageModel>
cast(getModel().getItems()).size())
+ if (updatedStorageModels.size() == Linq.<IStorageModel>
cast(getModel().getItems()).size())
{
- getModel().UpdatedStorageModels.clear();
+ updatedStorageModels.clear();
getModel().getHost().setItems(new ArrayList<HostModel>());
getModel().getHost().setSelectedItem(null);
@@ -84,7 +86,7 @@
FilterUnSelectableModels();
if (getModel().getSelectedItem() != null) {
- getModel().UpdateFormat();
+ getModel().updateFormat();
}
}
}
--
To view, visit http://gerrit.ovirt.org/14450
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9281939079fa40e03170d3a2b0a43b348128a02
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tni...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
