Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: sort iso images list (#852671) ......................................................................
webadmin: sort iso images list (#852671) https://bugzilla.redhat.com/852671 in storage iso images sub tab Change-Id: I9eab5186b92efcf8d49d788b4bff59794dc1560e Signed-off-by: Gilad Chaplik <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageIsoListModel.java 1 file changed, 23 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/7633/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageIsoListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageIsoListModel.java index 47c573d..2a9ca82 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageIsoListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageIsoListModel.java @@ -1,5 +1,9 @@ package org.ovirt.engine.ui.uicommonweb.models.storage; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; + import org.ovirt.engine.core.common.businessentities.RepoFileMetaData; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.queries.GetAllIsoImagesListParameters; @@ -15,9 +19,6 @@ import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.FrontendMultipleQueryAsyncResult; import org.ovirt.engine.ui.uicompat.IFrontendMultipleQueryAsyncCallback; - -import java.util.ArrayList; -import java.util.Arrays; @SuppressWarnings("unused") public class StorageIsoListModel extends SearchableListModel implements IFrontendMultipleQueryAsyncCallback @@ -152,7 +153,7 @@ StartProgress(null); Frontend.RunMultipleQueries(new ArrayList<VdcQueryType>(Arrays.asList(new VdcQueryType[] { - VdcQueryType.GetAllIsoImagesList, VdcQueryType.GetAllFloppyImagesList})), + VdcQueryType.GetAllIsoImagesList, VdcQueryType.GetAllFloppyImagesList })), new ArrayList<VdcQueryParametersBase>(Arrays.asList(new VdcQueryParametersBase[] { parameters, parameters })), this); @@ -178,11 +179,16 @@ isoReturnValue.getSucceeded() ? (ArrayList<RepoFileMetaData>) isoReturnValue.getReturnValue() : new ArrayList<RepoFileMetaData>(); - for (RepoFileMetaData item : isoImages) - { + ArrayList<String> fileNameList = new ArrayList<String>(); + for (RepoFileMetaData RepoFileMetaData : isoImages) { + fileNameList.add(RepoFileMetaData.getRepoFileName()); + } + Collections.sort(fileNameList, new Linq.CaseInsensitiveComparer()); + + for (String item : fileNameList) { EntityModel model = new EntityModel(); - model.setHashName(item.getRepoFileName()); - model.setTitle(item.getRepoFileName()); + model.setHashName(item); + model.setTitle(item); model.setEntity("CD/DVD"); //$NON-NLS-1$ items.add(model); } @@ -193,11 +199,16 @@ floppyReturnValue.getSucceeded() ? (ArrayList<RepoFileMetaData>) floppyReturnValue.getReturnValue() : new ArrayList<RepoFileMetaData>(); - for (RepoFileMetaData item : floppyImages) - { + ArrayList<String> floppyNameList = new ArrayList<String>(); + for (RepoFileMetaData RepoFileMetaData : floppyImages) { + floppyNameList.add(RepoFileMetaData.getRepoFileName()); + } + Collections.sort(floppyNameList, new Linq.CaseInsensitiveComparer()); + + for (String item : floppyNameList) { EntityModel model = new EntityModel(); - model.setHashName(item.getRepoFileName()); - model.setTitle(item.getRepoFileName()); + model.setHashName(item); + model.setTitle(item); model.setEntity("Floppy"); //$NON-NLS-1$ items.add(model); } -- To view, visit http://gerrit.ovirt.org/7633 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9eab5186b92efcf8d49d788b4bff59794dc1560e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
