Lior Vernia has uploaded a new change for review. Change subject: webadmin: Improved network sorting in Setup Networks popup ......................................................................
webadmin: Improved network sorting in Setup Networks popup Changed the sorting of networks by name, in the unassigned networks panel, to use LexoNumericComparator. Also moved it from the popup window's view to its model, where we usually perform sorting. Change-Id: I7c7e93f94b4d1082889a6f58d633bdbc140cd42a Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=915205 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java 2 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/12391/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java index 556bf29..474ba6f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java @@ -556,6 +556,17 @@ } private void initNetworkModels() { + Collections.sort(allNetworks, new Comparator<Network>() { + + private LexoNumericComparator lexoNumeric = new LexoNumericComparator(); + + @Override + public int compare(Network net1, Network net2) { + return lexoNumeric.compare(net1.getName(), net2.getName()); + } + + }); + Map<String, LogicalNetworkModel> networkModels = new HashMap<String, LogicalNetworkModel>(); for (Network network : allNetworks) { networkModels.put(network.getName(), new LogicalNetworkModel(network, this)); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java index c3c0cd6..3466647 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java @@ -1,7 +1,6 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup.host; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; @@ -147,7 +146,6 @@ private void updateNetworks(List<LogicalNetworkModel> allNetworks) { networkList.clear(); - Collections.sort(allNetworks); List<NetworkPanel> panels = new ArrayList<NetworkPanel>(); for (LogicalNetworkModel network : allNetworks) { if (!network.isAttached()) { -- To view, visit http://gerrit.ovirt.org/12391 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c7e93f94b4d1082889a6f58d633bdbc140cd42a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
