Daniel Erez has uploaded a new change for review. Change subject: wabadmin: snapshots sub-tab - sort info tabs ......................................................................
wabadmin: snapshots sub-tab - sort info tabs VMs -> Snapshots sub-tab: sort disks/nics info tabs. Change-Id: I5d917a721915e5243790a37eefc0d00594b993f4 Signed-off-by: Daniel Erez <[email protected]> --- 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/models/vms/SnapshotModel.java 2 files changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/21584/1 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 de3f2ad..e9d8cd4 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 @@ -37,6 +37,7 @@ import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; +import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VnicProfileView; import org.ovirt.engine.core.common.scheduling.ClusterPolicy; import org.ovirt.engine.core.common.scheduling.PolicyUnit; @@ -1127,6 +1128,17 @@ } } + + + public final static class VmInterfaceComparer implements Comparator<VmNetworkInterface>, Serializable { + LexoNumericComparator lexoNumeric = new LexoNumericComparator(); + + @Override + public int compare(VmNetworkInterface nic1, VmNetworkInterface nic2) { + return lexoNumeric.compare(nic1.getName(), nic2.getName()); + } + } + public final static class InterfaceComparator implements Comparator<VdsNetworkInterface>, Serializable { private static final long serialVersionUID = -6806871048546270786L; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SnapshotModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SnapshotModel.java index 97e724d..918b8dc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SnapshotModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SnapshotModel.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.ovirt.engine.core.common.action.CreateAllSnapshotsFromVmParameters; @@ -19,6 +20,7 @@ import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; +import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; @@ -228,7 +230,10 @@ snapshotModel.setDisks(vm.getDiskList()); snapshotModel.setNics(vm.getInterfaces()); snapshotModel.setApps(Arrays.asList(snapshot.getAppList() != null ? - snapshot.getAppList().split(",") : new String[] {})); //$NON-NLS-1$ + snapshot.getAppList().split(",") : new String[]{})); //$NON-NLS-1$ + + Collections.sort(snapshotModel.getDisks(), new Linq.DiskByAliasComparer()); + Collections.sort(snapshotModel.getNics(), new Linq.VmInterfaceComparer()); } onUpdateAsyncCallback.onSuccess(snapshotModel, null); -- To view, visit http://gerrit.ovirt.org/21584 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d917a721915e5243790a37eefc0d00594b993f4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
