Merge lp:~cjwatson/humpolec/sort-channels into lp:humpolec

Proposed by Colin Watson on 2014-06-05
Status: Needs review
Proposed branch: lp:~cjwatson/humpolec/sort-channels
Merge into: lp:humpolec
Diff against target: 19 lines (+2/-0)
1 file modified
src/com/canonical/ubuntu/installer/InstallActivity.java (+2/-0)
To merge this branch: bzr merge lp:~cjwatson/humpolec/sort-channels
Reviewer Review Type Date Requested Status
Ondrej Kubik 2014-06-05 Approve on 2014-06-05
Review via email: mp+222144@code.launchpad.net

Commit message

Sort the channel list.

Description of the change

It would make the channel list much easier to use if it were sorted.

(I confess I have not tested this. Hopefully it's reasonably obvious ...)

To post a comment you must log in.
Ondrej Kubik (ondrak) wrote :

Yes, this could be good change.
I kept list deliberately as it is on the server but with number of channels growing, we should change our strategy.

review: Approve

Unmerged revisions

61. By Colin Watson on 2014-06-05

Sort the channel list.

60. By Ondrej Kubik on 2014-03-05

Bumping up version for release

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/com/canonical/ubuntu/installer/InstallActivity.java'
2--- src/com/canonical/ubuntu/installer/InstallActivity.java 2014-01-09 08:54:46 +0000
3+++ src/com/canonical/ubuntu/installer/InstallActivity.java 2014-06-05 09:34:47 +0000
4@@ -3,6 +3,7 @@
5 import java.io.File;
6 import java.io.FileWriter;
7 import java.text.SimpleDateFormat;
8+import java.util.Arrays;
9 import java.util.Calendar;
10 import java.util.HashMap;
11 import java.util.List;
12@@ -241,6 +242,7 @@
13 } else if (0 != mAvailableChannels.size()) {
14 // get list of aliases as array
15 String channels[] = mAvailableChannels.keySet().toArray(new String[mAvailableChannels.size()]);
16+ Arrays.sort(channels);
17 // look for "trusty" as default channel
18 int defSelection = channels.length/2;
19 for (int i = 0 ; i < channels.length ; ++i) {

Subscribers

People subscribed via source and target branches