Alona Kaplan has uploaded a new change for review. Change subject: webadmin: Network subtabs should be sorted ......................................................................
webadmin: Network subtabs should be sorted Network Cluster- by cluster name Network Host- primary- cluster name, secondary- host name. Change-Id: I5a83db1190657106ebb146c3b71a825c4feab98d Signed-off-by: Alona Kaplan <[email protected]> --- 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 2 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/10533/1 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 82eca25..6191aaf 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 @@ -237,6 +237,20 @@ } @Override + public void setItems(Iterable value) { + Collections.sort((List<PairQueryable<VDSGroup, NetworkCluster>>) value, + new Comparator<PairQueryable<VDSGroup, NetworkCluster>>() { + + @Override + public int compare(PairQueryable<VDSGroup, NetworkCluster> arg0, + PairQueryable<VDSGroup, NetworkCluster> arg1) { + return arg0.getFirst().getname().compareTo(arg1.getFirst().getname()); + } + }); + super.setItems(value); + } + + @Override protected void EntityPropertyChanged(Object sender, PropertyChangedEventArgs e) { super.EntityPropertyChanged(sender, e); 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 a648083..8d783d8 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,8 @@ package org.ovirt.engine.ui.uicommonweb.models.networks; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import org.ovirt.engine.core.common.businessentities.NetworkView; @@ -91,6 +93,27 @@ setIsQueryFirstTime(false); } + @Override + public void setItems(Iterable value) { + Collections.sort((List<PairQueryable<VdsNetworkInterface, VDS>>) value, + new Comparator<PairQueryable<VdsNetworkInterface, VDS>>() { + + @Override + public int compare(PairQueryable<VdsNetworkInterface, VDS> arg0, + PairQueryable<VdsNetworkInterface, VDS> arg1) { + int compareValue = + arg0.getSecond().getvds_group_name().compareTo(arg1.getSecond().getvds_group_name()); + + if (compareValue != 0) { + return compareValue; + } + + return arg0.getSecond().getvds_name().compareTo(arg1.getSecond().getvds_name()); + } + }); + super.setItems(value); + } + public void setupNetworks() { if (getWindow() != null) { return; -- To view, visit http://gerrit.ovirt.org/10533 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a83db1190657106ebb146c3b71a825c4feab98d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
