Shahar Havivi has uploaded a new change for review. Change subject: findbugs: use entrySet iteration instead of keySet ......................................................................
findbugs: use entrySet iteration instead of keySet This methods accesses the value of a Map entry, using a key that was retrieved from a keySet iterator. It is more efficient to use an iterator on the entrySet of the map, to avoid the Map.get(key) lookup findbugs reason: WMI: Inefficient use of keySet iterator instead of entrySet iterator (WMI_WRONG_MAP_ITERATOR) Change-Id: I770f16b04488e21e441233686a81b4c1f3900be7 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJob.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectAllHostsToLunCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ValueObjectMap.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/gluster/GlusterAuditLogUtil.java M backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetStoragePoolInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java 14 files changed, 67 insertions(+), 61 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/15406/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java index 2385ed6..0f215e0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java @@ -105,10 +105,10 @@ if (retVal) { Map<VmTemplate, List<DiskImage>> templates = (Map) qretVal.getReturnValue(); ArrayList<DiskImage> images = new ArrayList<DiskImage>(); - for (VmTemplate t : templates.keySet()) { - if (t.getId().equals(getVmTemplate().getId())) { - images = new ArrayList<DiskImage>(templates.get(t)); - getVmTemplate().setInterfaces(t.getInterfaces()); + for (Map.Entry<VmTemplate, List<DiskImage>> entry : templates.entrySet()) { + if (entry.getKey().getId().equals(getVmTemplate().getId())) { + images = new ArrayList<DiskImage>(entry.getValue()); + getVmTemplate().setInterfaces(entry.getKey().getInterfaces()); break; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java index 98e0111..975bfa5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java @@ -280,10 +280,10 @@ } else { java.util.HashMap<Guid, LdapUser> parentGroupUser = _groupsAdUsersMap.get(parentGroupName); if (parentGroupUser != null && groupUsers != null) { - for (Guid userId : groupUsers.keySet()) { - if (!parentGroupUser.containsKey(userId)) { - parentGroupUser.put(userId, groupUsers.get(userId)); - AddGroupToUser(groupUsers.get(userId), parentGroupName); + for (Map.Entry<Guid, LdapUser> entry : groupUsers.entrySet()) { + if (!parentGroupUser.containsKey(entry.getKey())) { + parentGroupUser.put(entry.getKey(), entry.getValue()); + AddGroupToUser(entry.getValue(), parentGroupName); } } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJob.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJob.java index 1ccc854..8c9d59e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJob.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJob.java @@ -242,24 +242,24 @@ Map<String, Integer> existingHookConflictMap, Set<VDS> upServers) { //Add missing conflicts for hooks that are missing on any one of the servers - for (Guid hookId: existingHookServersMap.keySet()) { - if (existingHookServersMap.get(hookId).size() == upServers.size()) { + for (Map.Entry<Guid, Set<VDS>> entry : existingHookServersMap.entrySet()) { + if (entry.getValue().size() == upServers.size()) { //hook is present in all of the servers. Nothing to do continue; } //Get servers on which the hooks are missing. Set<VDS> hookMissingServers = new HashSet<VDS>(upServers); - hookMissingServers.removeAll(existingHookServersMap.get(hookId)); + hookMissingServers.removeAll(entry.getValue()); for (VDS missingServer : hookMissingServers) { GlusterServerHook missingServerHook = new GlusterServerHook(); - missingServerHook.setHookId(hookId); + missingServerHook.setHookId(entry.getKey()); missingServerHook.setServerId(missingServer.getId()); missingServerHook.setStatus(GlusterHookStatus.MISSING); getHooksDao().saveOrUpdateGlusterServerHook(missingServerHook); } //get the hook from database, as we don't have the hookkey for it - GlusterHookEntity hookEntity = getHooksDao().getById(hookId); + GlusterHookEntity hookEntity = getHooksDao().getById(entry.getKey()); if (existingHookMap.get(hookEntity.getHookKey()) != null) { //if it was an already existing hook, get the hook with //updated conflict values from map diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java index 391248b..5dfc26b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java @@ -13,9 +13,9 @@ import org.ovirt.engine.core.common.businessentities.QuotaStorage; import org.ovirt.engine.core.common.businessentities.QuotaUsagePerUser; import org.ovirt.engine.core.common.businessentities.QuotaVdsGroup; +import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VMStatus; -import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VdcBllMessages; @@ -199,12 +199,12 @@ Map<Guid, Double> newUsedGlobalStorageSize, Map<Guid, Map<Guid, Double>> newUsedSpecificStorageSize) { // cache new storage size. - for (Guid quotaId : newUsedGlobalStorageSize.keySet()) { - Quota quota = quotaMap.get(quotaId); - double value = newUsedGlobalStorageSize.get(quotaId); + for (Map.Entry<Guid, Double> entry : newUsedGlobalStorageSize.entrySet()) { + Quota quota = quotaMap.get(entry.getKey()); + double value = entry.getValue(); if (value < 0) { - log.errorFormat("Quota id {0} cached storage size is negative, removing from cache", quotaId); - quotaMap.remove(quotaId); + log.errorFormat("Quota id {0} cached storage size is negative, removing from cache", entry.getKey()); + quotaMap.remove(entry.getKey()); continue; } quota.getGlobalQuotaStorage().setStorageSizeGBUsage(value); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectAllHostsToLunCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectAllHostsToLunCommand.java index b6b8315..517159c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectAllHostsToLunCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectAllHostsToLunCommand.java @@ -101,9 +101,9 @@ } else { // disconnect all hosts if connection is not in use by other luns Map<String, List<Guid>> processed = result.getSecond(); - for (String lunId : processed.keySet()) { - for (Guid vdsId : processed.get(lunId)) { - LUNs lun = lunsMap.get(lunId); + for (Map.Entry<String, List<Guid>> entry : processed.entrySet()) { + for (Guid vdsId : entry.getValue()) { + LUNs lun = lunsMap.get(entry.getKey()); StorageHelperDirector.getInstance().getItem(getStoragePool().getstorage_pool_type()) .disconnectStorageFromLunByVdsId(getStorageDomain(), vdsId, lun); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java index 2aa2e95..5e659f1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java @@ -44,9 +44,9 @@ // add disk map Map<Guid, List<DiskImage>> images = ImportVmCommand .getImagesLeaf(diskImages); - for (Guid id : images.keySet()) { - List<DiskImage> list = images.get(id); - vm.getDiskMap().put(id, list.get(list.size() - 1)); + for (Map.Entry<Guid, List<DiskImage>> entry : images.entrySet()) { + List<DiskImage> list = entry.getValue(); + vm.getDiskMap().put(entry.getKey(), list.get(list.size() - 1)); } vms.add(vm); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ValueObjectMap.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ValueObjectMap.java index 358c296..1c9373b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ValueObjectMap.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ValueObjectMap.java @@ -1,11 +1,11 @@ package org.ovirt.engine.core.common.queries; import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.util.HashMap; import java.util.Set; -import java.util.ArrayList; public class ValueObjectMap extends ValueObject implements Serializable { private static final long serialVersionUID = -8970215546874151379L; @@ -21,8 +21,9 @@ // if the value is also a map construct a ValueObjectMap from the value // as well. if (mapOfMaps) { - for (Object key : map.keySet()) { - Map innerMap = (Map) map.get(key); + for (Object e : map.entrySet()) { + Map.Entry<Object, Map> entryMap = (Map.Entry<Object, Map>) e; + Map innerMap = entryMap.getValue(); boolean innerMapIsMapOfMaps = false; // If map of maps, it is possible the inner map is also a map of maps // So the inner ValueObjectMap should be constructed accordingly @@ -38,7 +39,7 @@ } } - valuePairs.add(new ValueObjectPair(key, new ValueObjectMap(innerMap, innerMapIsMapOfMaps))); + valuePairs.add(new ValueObjectPair(entryMap.getKey(), new ValueObjectMap(innerMap, innerMapIsMapOfMaps))); ++i; } } else { diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/gluster/GlusterAuditLogUtil.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/gluster/GlusterAuditLogUtil.java index f0eb63a..4faebde 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/gluster/GlusterAuditLogUtil.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/gluster/GlusterAuditLogUtil.java @@ -2,6 +2,7 @@ import java.util.Collections; import java.util.Map; +import java.util.Map.Entry; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.businessentities.VDS; @@ -49,8 +50,8 @@ logable.setVdsGroupId(clusterId == null ? Guid.Empty : clusterId); if (customValues != null) { - for (String key : customValues.keySet()) { - logable.addCustomValue(key, customValues.get(key)); + for (Entry<String, String> entry : customValues.entrySet()) { + logable.addCustomValue(entry.getKey(), entry.getValue()); } } diff --git a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java index f46e756..8c33f3b 100644 --- a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java +++ b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/LinkHelper.java @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map.Entry; import javax.ws.rs.Path; import javax.ws.rs.core.UriBuilder; @@ -494,9 +495,9 @@ ParentToCollectionMap collections = TYPES.get(model.getClass()); if (suggestedParentType != null) { - for (Class<? extends BaseResource> parentType : collections.keySet()) { - if (parentType.equals(suggestedParentType)) { - return collections.get(parentType); + for (Entry<Class<? extends BaseResource>, Collection> entry : collections.entrySet()) { + if (entry.getKey().equals(suggestedParentType)) { + return entry.getValue(); } } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index 5f9db4a..52fc2dc 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -752,10 +752,10 @@ // check the bond statuses, if one is down we mark it as broken // only if we didn't already mark a NIC as broken if (brokenNics.isEmpty()) { - for (String key : bondsWithStatus.keySet()) { - if (!bondsWithStatus.get(key)) { + for (Entry<String, Boolean> entry : bondsWithStatus.entrySet()) { + if (!entry.getValue()) { // add the nics name for audit log - for (String name : bondsWithListOfNics.get(key)) { + for (String name : bondsWithListOfNics.get(entry.getKey())) { brokenNics.add(name); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetStoragePoolInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetStoragePoolInfoVDSCommand.java index 26c0812..2e707d3 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetStoragePoolInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetStoragePoolInfoVDSCommand.java @@ -3,9 +3,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; -import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StorageDomain; +import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.vdscommands.GetStoragePoolInfoVDSCommandParameters; import org.ovirt.engine.core.compat.Guid; @@ -47,11 +48,11 @@ private java.util.ArrayList<StorageDomain> ParseStorageDomainList(Map<String, Object> xmlRpcStruct, Guid masterId) { java.util.ArrayList<StorageDomain> domainsList = new java.util.ArrayList<StorageDomain>( xmlRpcStruct.size()); - for (String domain : xmlRpcStruct.keySet()) { - Map<String, Object> domainAsStruct = (Map<String, Object>) xmlRpcStruct.get(domain); + for (Entry<String, Object> entry : xmlRpcStruct.entrySet()) { + Map<String, Object> domainAsStruct = (Map<String, Object>) entry.getValue(); StorageDomain sd = GetStorageDomainStatsVDSCommand.BuildStorageDynamicFromXmlRpcStruct(domainAsStruct); sd.setStoragePoolId(getParameters().getStoragePoolId()); - sd.setId(new Guid(domain)); + sd.setId(new Guid(entry.getKey())); if (!masterId.equals(Guid.Empty) && masterId.equals(sd.getId())) { sd.setStorageDomainType(StorageDomainType.Master); } else if (!masterId.equals(Guid.Empty)) { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsInfoVDSCommand.java index cb3ddf5..5e287d2 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsInfoVDSCommand.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.vdsbroker.irsbroker; import java.util.Map; +import java.util.Map.Entry; import org.ovirt.engine.core.common.vdscommands.GetVmsInfoVDSCommandParameters; import org.ovirt.engine.core.compat.Guid; @@ -33,8 +34,8 @@ Map<String, Object> xmlRpcStruct = _vmsInfo.vmlist; java.util.ArrayList<String> retVal = new java.util.ArrayList<String>(); - for (String key : xmlRpcStruct.keySet()) { - retVal.add(xmlRpcStruct.get(key).toString()); + for (Entry<String, Object> entry : xmlRpcStruct.entrySet()) { + retVal.add(entry.getValue().toString()); } setReturnValue(retVal); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java index 0d147cb..e5d1cac 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java @@ -20,6 +20,7 @@ import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.Entities; import org.ovirt.engine.core.common.businessentities.SessionState; +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.VDSDomainsData; @@ -30,7 +31,6 @@ import org.ovirt.engine.core.common.businessentities.VmGuestAgentInterface; import org.ovirt.engine.core.common.businessentities.VmPauseStatus; import org.ovirt.engine.core.common.businessentities.VmStatistics; -import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.network.InterfaceStatus; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol; @@ -514,17 +514,17 @@ .get(VdsProperties.NETWORK); if (interfaces != null) { int networkUsage = 0; - for (String name : interfaces.keySet()) { + for (Entry<String, Object> entry : interfaces.entrySet()) { VdsNetworkInterface iface = null; for (VdsNetworkInterface tempInterface : vds.getInterfaces()) { - if (tempInterface.getName().equals(name)) { + if (tempInterface.getName().equals(entry.getKey())) { iface = tempInterface; break; } } if (iface != null) { iface.setVdsId(vds.getId()); - Map<String, Object> dict = (Map<String, Object>) interfaces.get(name); + Map<String, Object> dict = (Map<String, Object>) entry.getValue(); Double rx_rate = AssignDoubleValue(dict, VdsProperties.rx_rate); Double rx_dropped = AssignDoubleValue(dict, VdsProperties.rx_dropped); Double tx_rate = AssignDoubleValue(dict, VdsProperties.tx_rate); @@ -616,10 +616,10 @@ vds.setLocalDisksUsage(diskStats); - for (String path : diskStatsStruct.keySet()) { - Map<String, Object> pathStatsStruct = (Map<String, Object>) diskStatsStruct.get(path); + for (Entry<String, Object> entry : diskStatsStruct.entrySet()) { + Map<String, Object> pathStatsStruct = (Map<String, Object>) entry.getValue(); - diskStats.put(path, AssignLongValue(pathStatsStruct, VdsProperties.DISK_STATS_FREE)); + diskStats.put(entry.getKey(), AssignLongValue(pathStatsStruct, VdsProperties.DISK_STATS_FREE)); } } } @@ -1126,16 +1126,16 @@ private static void addHostNetworkInterfaces(VDS vds, Map<String, Object> xmlRpcStruct) { Map<String, Object> nics = (Map<String, Object>) xmlRpcStruct.get(VdsProperties.NETWORK_NICS); if (nics != null) { - for (String key : nics.keySet()) { + for (Entry<String, Object> entry : nics.entrySet()) { VdsNetworkInterface iface = new VdsNetworkInterface(); VdsNetworkStatistics iStats = new VdsNetworkStatistics(); iface.setStatistics(iStats); iStats.setId(Guid.NewGuid()); iface.setId(iStats.getId()); - iface.setName(key); + iface.setName(entry.getKey()); iface.setVdsId(vds.getId()); - updateNetworkInterfaceDataFromHost(iface, (Map<String, Object>) nics.get(key)); + updateNetworkInterfaceDataFromHost(iface, (Map<String, Object>) entry.getValue()); iStats.setVdsId(vds.getId()); vds.getInterfaces().add(iface); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java index f0f5325..c6a8992 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java @@ -3,6 +3,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Map.Entry; import org.ovirt.engine.core.common.businessentities.comparators.LexoNumericComparator; import org.ovirt.engine.ui.common.widget.MenuBar; @@ -160,14 +161,14 @@ private MenuBar menuFor(NetworkItemModel<?> item) { MenuBar menu = rootMenu(item); OperationMap operationMap = item.getSetupModel().commandsFor(item); - for (final NetworkOperation operation : operationMap.keySet()) { - final List<NetworkCommand> commands = operationMap.get(operation); - if (operation.isUnary()) { + for (final Entry<NetworkOperation, List<NetworkCommand>> entry : operationMap.entrySet()) { + final List<NetworkCommand> commands = entry.getValue(); + if (entry.getKey().isUnary()) { assert commands.size() == 1 : "Got a NetworkCommand List with more than one Unary Operation"; //$NON-NLS-1$ - menu.addItem(operation.getVerb(item), new Command() { + menu.addItem(entry.getKey().getVerb(item), new Command() { @Override public void execute() { - executeCommand(operation, commands.get(0)); + executeCommand(entry.getKey(), commands.get(0)); } }); } else { @@ -184,11 +185,11 @@ subMenu.addItem(new MenuItem(command.getName(), new Command() { @Override public void execute() { - executeCommand(operation, command); + executeCommand(entry.getKey(), command); } })); } - menu.addItem(operation.getVerb(item), subMenu); + menu.addItem(entry.getKey().getVerb(item), subMenu); } } return menu; -- To view, visit http://gerrit.ovirt.org/15406 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I770f16b04488e21e441233686a81b4c1f3900be7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
