Tal Nisan has uploaded a new change for review. Change subject: frontend: Change ListModel items from Iterable to Collection ......................................................................
frontend: Change ListModel items from Iterable to Collection Due to a legacy the items in ListModel was of type Iterable which is a very limited type, since all of the multiple entity results from the backend come as either a List or a Set, it is safe to change the type to be a Collection and have the extra functionality from this type Change-Id: I69fcf4a6340aa74e8fa048d2a1f68bfc8eb99b24 Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SortedListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RolePermissionListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyClusterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkProfileListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileTemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileVmListModel.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/tags/TagListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TimeZoneModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalVmEventListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmAppListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModelBase.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java 42 files changed, 100 insertions(+), 61 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/24337/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java index c7c1e1c..9eeb3b8 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.common.widget.profile; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; @@ -33,7 +34,7 @@ private static final CommonApplicationMessages messages = GWT.create(CommonApplicationMessages.class); - private Iterable<VnicProfileView> vnicProfiles; + private Collection<VnicProfileView> vnicProfiles; private final List<VmNetworkInterface> vnics; private int realEntryCount; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java index a43f2b4..a97fff5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java @@ -3,6 +3,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Comparator; import java.util.HashSet; import java.util.List; @@ -589,7 +590,7 @@ return true; } - public static <TSource> Iterable<TSource> where(Iterable<TSource> source, IPredicate<TSource> predicate) + public static <TSource> Collection<TSource> where(Collection<TSource> source, IPredicate<TSource> predicate) { ArrayList<TSource> list = new ArrayList<TSource>(); @@ -1263,9 +1264,9 @@ } } - public final static <T extends Disk> Iterable<T> filterDisksByStorageType( - Iterable<Disk> source, final DiskStorageType diskStorageType) { - return (Iterable<T>) where(source, new IPredicate<Disk>() { + public final static <T extends Disk> Collection<T> filterDisksByStorageType( + Collection<Disk> source, final DiskStorageType diskStorageType) { + return (Collection<T>) where(source, new IPredicate<Disk>() { @Override public boolean match(Disk source) { return source.getDiskStorageType() == diskStorageType; @@ -1273,7 +1274,7 @@ }); } - public final static Iterable<Provider> filterProvidersByProvidedType(Iterable<Provider> source, + public final static Collection<Provider> filterProvidersByProvidedType(Collection<Provider> source, final VdcObjectType type) { return where(source, new IPredicate<Provider>() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index ee7bddd..e23690a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -2942,7 +2942,7 @@ return new ArrayList<Provider>(); } List<Provider> providers = - Linq.toList(Linq.filterProvidersByProvidedType((Iterable<Provider>) returnValue, providedEntity)); + Linq.toList(Linq.filterProvidersByProvidedType((Collection<Provider>) returnValue, providedEntity)); Collections.sort(providers, new NameableComparator()); return providers; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListModel.java index 6e57ba7..ec2b0f0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ListModel.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.uicommonweb.models; +import java.util.Collection; import java.util.List; import org.ovirt.engine.ui.uicommonweb.validation.IValidation; import org.ovirt.engine.ui.uicommonweb.validation.ValidationResult; @@ -93,14 +94,14 @@ } } - protected Iterable<T> items; + protected Collection<T> items; - public Iterable<T> getItems() + public Collection<T> getItems() { return items; } - public void setItems(Iterable<T> value) + public void setItems(Collection<T> value) { if (items != value) { @@ -249,7 +250,7 @@ setSelectedItems(null); } - protected void itemsChanging(Iterable<T> newValue, Iterable<T> oldValue) + protected void itemsChanging(Collection<T> newValue, Collection<T> oldValue) { IProvideCollectionChangedEvent notifier = (IProvideCollectionChangedEvent) ((oldValue instanceof IProvideCollectionChangedEvent) ? oldValue diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java index 94ca787..5311ee1 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java @@ -737,7 +737,7 @@ } @Override - public void setItems(Iterable<T> value) + public void setItems(Collection<T> value) { if (items != value) { @@ -833,7 +833,7 @@ public void onSuccess(Object model, Object ReturnValue) { SearchableListModel searchableListModel = (SearchableListModel) model; - searchableListModel.setItems((Iterable) ((VdcQueryReturnValue) ReturnValue).getReturnValue()); + searchableListModel.setItems((Collection) ((VdcQueryReturnValue) ReturnValue).getReturnValue()); } }; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SortedListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SortedListModel.java index 1e014d8..d53d2b0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SortedListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SortedListModel.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.uicommonweb.models; +import java.util.Collection; import java.util.Comparator; import java.util.SortedSet; import java.util.TreeSet; @@ -13,7 +14,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { SortedSet items = new TreeSet(comparator); for (Object item : value) { items.add(item); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java index d6ef844..dd6ef86 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.configure; import java.util.ArrayList; +import java.util.Collection; import org.ovirt.engine.core.common.action.PermissionsOperationsParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; @@ -78,7 +79,7 @@ public void onSuccess(Object model, Object ReturnValue) { SystemPermissionListModel systemPermissionListModel = (SystemPermissionListModel) model; - systemPermissionListModel.setItems((Iterable) ((VdcQueryReturnValue) ReturnValue).getReturnValue()); + systemPermissionListModel.setItems((Collection) ((VdcQueryReturnValue) ReturnValue).getReturnValue()); } }; VdcQueryParametersBase params = new VdcQueryParametersBase(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RolePermissionListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RolePermissionListModel.java index d640d86..7cf4126 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RolePermissionListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RolePermissionListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.configure.roles_ui; import java.util.ArrayList; +import java.util.Collection; import org.ovirt.engine.core.common.action.PermissionsOperationsParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; @@ -72,7 +73,7 @@ public void onSuccess(Object model, Object ReturnValue) { RolePermissionListModel permissionListModel = (RolePermissionListModel) model; - permissionListModel.setItems((Iterable) ((VdcQueryReturnValue) ReturnValue).getReturnValue()); + permissionListModel.setItems((Collection) ((VdcQueryReturnValue) ReturnValue).getReturnValue()); } }; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyClusterListModel.java index c0bd2fd..b43effc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyClusterListModel.java @@ -1,5 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.configure.scheduling; +import java.util.Collection; + import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -23,7 +25,7 @@ @Override public void onSuccess(Object model, Object returnValue) { ClusterPolicyClusterListModel clusterPolicyClusterListModel = (ClusterPolicyClusterListModel) model; - clusterPolicyClusterListModel.setItems((Iterable) ((VdcQueryReturnValue) returnValue).getReturnValue()); + clusterPolicyClusterListModel.setItems((Collection) ((VdcQueryReturnValue) returnValue).getReturnValue()); } }); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java index c8e8067..1ce0d13 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java @@ -57,7 +57,7 @@ private EntityModel export; private ListModel externalProviders; private ListModel<String> networkLabel; - private Iterable<String> dcLabels; + private Collection<String> dcLabels; private EntityModel privateComment; private EntityModel privateVLanTag; private EntityModel privateIsStpEnabled; @@ -513,7 +513,7 @@ @Override public void onSuccess(Object model, Object returnValue) { - Iterable<NetworkQoS> qos = (Iterable<NetworkQoS>) returnValue; + Collection<NetworkQoS> qos = (Collection<NetworkQoS>) returnValue; getQos().setItems(qos); getQos().setSelectedItem(Linq.findNetworkQosById(qos, getNetwork().getQosId())); } @@ -724,7 +724,7 @@ @Override public void onSuccess(Object model, Object returnValue) { - dcLabels = (Iterable<String>) returnValue; + dcLabels = (Collection<String>) returnValue; stopProgress(); onExportChanged(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java index 3fc0c52..aa26b45 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.disks; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.ovirt.engine.core.common.action.ChangeQuotaParameters; @@ -208,7 +209,7 @@ } @Override - public void setItems(Iterable value) + public void setItems(Collection value) { if (value == null) { super.setItems(null); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java index f8e9dd8..846c98a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -157,13 +158,13 @@ } @Override - public Iterable getItems() + public Collection getItems() { return super.items; } @Override - public void setItems(Iterable value) + public void setItems(Collection value) { if (items != value) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java index 966132a..4b24f87 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.networks; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -137,7 +138,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { Collections.sort((List<PairQueryable<VDSGroup, NetworkCluster>>) value, new Comparator<PairQueryable<VDSGroup, NetworkCluster>>() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java index 89debb3..9136701 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.networks; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -96,7 +97,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { Collections.sort((List<PairQueryable<VdsNetworkInterface, VDS>>) value, new Comparator<PairQueryable<VdsNetworkInterface, VDS>>() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkProfileListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkProfileListModel.java index a0848e7..333069f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkProfileListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkProfileListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.networks; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -184,7 +185,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { if (value != null) { Collections.sort((List<VnicProfileView>) value, new Linq.VnicProfileViewComparator()); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java index b5812c2..d6a595e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.networks; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -74,7 +75,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { if (value != null) { List<PairQueryable<VmNetworkInterface, VmTemplate>> itemList = (List<PairQueryable<VmNetworkInterface, VmTemplate>>) value; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java index 3e76ea7..09cd0ed 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.networks; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -66,7 +67,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { if (value != null) { List<PairQueryable<VmNetworkInterface, VM>> itemList = (List<PairQueryable<VmNetworkInterface, VM>>) value; Collections.sort(itemList, new Comparator<PairQueryable<VmNetworkInterface, VM>>() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileListModel.java index 28a8259..c075987 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileListModel.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -297,7 +298,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { if (value != null) { Collections.sort((List<VnicProfileView>) value, new Linq.VnicProfileViewComparator()); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileTemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileTemplateListModel.java index 7fd088d..2831dec 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileTemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileTemplateListModel.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.uicommonweb.models.profiles; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -46,7 +47,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { if (value != null) { List<VmTemplate> itemList = (List<VmTemplate>) value; Collections.sort(itemList, new Linq.VmTemplateComparator()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileVmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileVmListModel.java index 8df9120..9c796ab 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileVmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileVmListModel.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.uicommonweb.models.profiles; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -46,7 +47,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { if (value != null) { List<VM> itemList = (List<VM>) value; Collections.sort(itemList, new Linq.VmComparator()); 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 b38d839..cb4eb9e 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 @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.List; @@ -537,13 +538,13 @@ @Override public void onSuccess(Object model, Object returnValue) { StorageModel storageModel = (StorageModel) model; - Iterable<VDS> hosts = (Iterable<VDS>) returnValue; + Collection<VDS> hosts = (Collection<VDS>) returnValue; storageModel.postUpdateHost(hosts); } }, getHash()), dataCenterId, localFsOnly); } - public void postUpdateHost(Iterable<VDS> hosts) + public void postUpdateHost(Collection<VDS> hosts) { // Filter hosts hosts = Linq.where(hosts, new Linq.HostStatusPredicate(VDSStatus.Up)); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java index 5fb9c56..20dca98 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/tags/TagListModel.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Map; import org.ovirt.engine.core.common.action.TagsActionParametersBase; @@ -108,13 +109,13 @@ } @Override - public Iterable getItems() + public Collection getItems() { return items; } @Override - public void setItems(Iterable value) + public void setItems(Collection value) { if (items != value) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java index df1e520..b37e0fe 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.templates; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.ovirt.engine.core.common.businessentities.Disk; @@ -51,7 +52,7 @@ } @Override - public void setItems(final Iterable value, final Guid storageDomainId) + public void setItems(final Collection value, final Guid storageDomainId) { String vmt_guidKey = "_VMT_ID ="; //$NON-NLS-1$ String orKey = " or "; //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java index 38ac053..733e5b2 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.templates; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -139,7 +140,7 @@ } @Override - public void setItems(final Iterable value) + public void setItems(final Collection value) { if (ignoreStorageDomains) { setDisks(value); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java index d60e644..1bf3889 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.templates; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -279,7 +280,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { genVersionToBaseTemplate(value); super.setItems(value); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java index f39ec51..b5785ab 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateStorageListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.templates; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import org.ovirt.engine.core.common.action.RemoveDiskParameters; @@ -49,7 +50,7 @@ } ArrayList<StorageDomainModel> storageDomainModels; - Iterable value; + Collection value; public TemplateStorageListModel() { @@ -91,7 +92,7 @@ } @Override - public void setItems(Iterable value) + public void setItems(Collection value) { if (storageDomainModels != null) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateDiskListModel.java index fe66c3c..78b8bca 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateDiskListModel.java @@ -1,10 +1,12 @@ package org.ovirt.engine.ui.uicommonweb.models.templates; +import java.util.Collection; + public class UserPortalTemplateDiskListModel extends TemplateDiskListModel { @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { ignoreStorageDomains = true; super.setItems(value); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java index feca3c9..4c8284b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.uicommonweb.models.templates; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -28,7 +29,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { List<AuditLog> list = (List<AuditLog>) value; if (list != null) { Collections.sort(list, Collections.reverseOrder(new Linq.AuditLogComparer())); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java index e9ac90d..a0acf97 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalBasicListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.userportal; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -157,7 +158,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { if (items != value) { itemsChanging(value, items); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java index 7d9aada..0dec909 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; @@ -299,7 +300,7 @@ } @Override - public void setItems(Iterable value) + public void setItems(Collection value) { if (items != value) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java index 8e49bab..0da42a4 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.userportal; import java.util.ArrayList; +import java.util.Collection; import org.ovirt.engine.core.common.VdcActionUtils; import org.ovirt.engine.core.common.action.VdcActionType; @@ -26,7 +27,7 @@ AsyncDataProvider.getAllVmTemplates(new AsyncQuery(this, new INewAsyncCallback() { @Override public void onSuccess(Object model, Object returnValue) { - ((UserPortalTemplateListModel) model).setItems((Iterable) returnValue); + ((UserPortalTemplateListModel) model).setItems((Collection) returnValue); } }), getIsQueryFirstTime()); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java index 20b33e5..0b6f10e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java @@ -577,7 +577,7 @@ && getClusterQuota().getIsValid(); } - public void setItems(final Iterable value, final Guid storageDomainId) + public void setItems(final Collection value, final Guid storageDomainId) { String vm_guidKey = "ID ="; //$NON-NLS-1$ String orKey = " or "; //$NON-NLS-1$ @@ -626,7 +626,7 @@ } - public void setSuperItems(Iterable value) { + public void setSuperItems(Collection value) { super.setItems(value); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java index 630f09c..cd6ed4f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java @@ -35,6 +35,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; public abstract class RunOnceModel extends Model @@ -825,9 +826,9 @@ @Override public void onSuccess(Object model, Object returnValue) { - Iterable<VmNetworkInterface> nics = - (Iterable<VmNetworkInterface>) ((VdcQueryReturnValue) returnValue).getReturnValue(); - Iterable<VmNetworkInterface> pluggedNics = + Collection<VmNetworkInterface> nics = + (Collection<VmNetworkInterface>) ((VdcQueryReturnValue) returnValue).getReturnValue(); + Collection<VmNetworkInterface> pluggedNics = Linq.where(nics, new Linq.IPredicate<VmNetworkInterface>() { @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TimeZoneModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TimeZoneModel.java index 5a3f966..5eff62a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TimeZoneModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TimeZoneModel.java @@ -4,6 +4,7 @@ import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -11,9 +12,9 @@ public class TimeZoneModel { - private static final Map<TimeZoneType, Iterable<TimeZoneModel>> cachedTimeZoneModels = new HashMap<TimeZoneType, Iterable<TimeZoneModel>>(); + private static final Map<TimeZoneType, Collection<TimeZoneModel>> cachedTimeZoneModels = new HashMap<TimeZoneType, Collection<TimeZoneModel>>(); - public static Iterable<TimeZoneModel> getTimeZones(TimeZoneType timeZoneType) { + public static Collection<TimeZoneModel> getTimeZones(TimeZoneType timeZoneType) { return cachedTimeZoneModels.get(timeZoneType); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalVmEventListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalVmEventListModel.java index aeceaaa..1ebe723 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalVmEventListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalVmEventListModel.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -28,7 +29,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { List<AuditLog> list = (List<AuditLog>) value; if (list != null) { Collections.sort(list, Collections.reverseOrder(new Linq.AuditLogComparer())); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmAppListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmAppListModel.java index a359ade..cfb9d0b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmAppListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmAppListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import org.ovirt.engine.core.common.businessentities.VM; @@ -21,13 +22,13 @@ { @Override - public Iterable getItems() + public Collection getItems() { return items; } @Override - public void setItems(Iterable value) + public void setItems(Collection value) { if (items != value) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java index 5f01c41..6d930ef 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -257,7 +258,7 @@ } @Override - public void setItems(Iterable value) + public void setItems(Collection value) { ArrayList<Disk> disks = value != null ? Linq.<Disk> cast(value) : new ArrayList<Disk>(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModelBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModelBase.java index acbef30..14c5f2f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModelBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModelBase.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; import java.util.ArrayList; +import java.util.Collection; import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.Disk.DiskStorageType; @@ -31,7 +32,7 @@ @SuppressWarnings("rawtypes") @Override - public void setItems(Iterable value) + public void setItems(Collection value) { ArrayList<Disk> disks = value != null ? Linq.<Disk> cast(value) : new ArrayList<Disk>(); ArrayList<Disk> filteredDisks = new ArrayList<Disk>(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java index 76205ea..5736998 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.ovirt.engine.core.common.VdcActionUtils; @@ -293,7 +294,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { super.setItems(value); if (getSelectedItem() == null && (getSelectedItems() == null || getSelectedItems().size() == 0)) { if (value != null && value.iterator().hasNext()) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index e9f04f8..0de36ce 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -662,7 +663,7 @@ } @Override - public void setItems(Iterable value) { + public void setItems(Collection value) { consoleModelsCache.updateVmCache(value); super.setItems(value); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java index 969332d..a5dc75b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java @@ -268,7 +268,7 @@ } private void doUpdateTimeZone(final String selectedTimeZone) { - final Iterable<TimeZoneModel> timeZones = TimeZoneModel.getTimeZones(getTimeZoneType()); + final Collection<TimeZoneModel> timeZones = TimeZoneModel.getTimeZones(getTimeZoneType()); getModel().getTimeZone().setItems(timeZones); getModel().getTimeZone().setSelectedItem(Linq.firstOrDefault(timeZones, new Linq.TimeZonePredicate(selectedTimeZone))); getModel().getTimeZone().setChangeProhibitionReason(constants.timeZoneNotChangeableForLinuxVms()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java index 76bff03..968aebd 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -232,7 +233,7 @@ } @Override - public void setItems(Iterable value) + public void setItems(Collection value) { ArrayList<Snapshot> snapshots = value != null ? Linq.<Snapshot> cast(value) : new ArrayList<Snapshot>(); -- To view, visit http://gerrit.ovirt.org/24337 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I69fcf4a6340aa74e8fa048d2a1f68bfc8eb99b24 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
