Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

sort tree alphabetically

Browse Source
This commit is contained in:
Athou
2013-04-03 12:25:29 +02:00
parent 2c891f516e
commit 4c25bcdc1b
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/commafeed/frontend/rest/resources/SubscriptionsREST.java
View File

@@ -1,5 +1,7 @@
package com.commafeed.frontend.rest.resources; package com.commafeed.frontend.rest.resources;
import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import javax.ws.rs.Consumes;
@@ -101,7 +103,7 @@ public class SubscriptionsREST extends AbstractREST {
public Response collapse(@QueryParam("id") String id, public Response collapse(@QueryParam("id") String id,
@QueryParam("collapse") boolean collapse) { @QueryParam("collapse") boolean collapse) {
Preconditions.checkNotNull(id); Preconditions.checkNotNull(id);
if (EntriesREST.ALL.equals(id)) { if (!EntriesREST.ALL.equals(id)) {
FeedCategory category = feedCategoryService.findById(getUser(), FeedCategory category = feedCategoryService.findById(getUser(),
Long.valueOf(id)); Long.valueOf(id));
category.setCollapsed(collapse); category.setCollapsed(collapse);
@@ -189,6 +191,12 @@ public class SubscriptionsREST extends AbstractREST {
category.getChildren().add(child); category.getChildren().add(child);
} }
} }
Collections.sort(category.getChildren(), new Comparator<Category>() {
@Override
public int compare(Category o1, Category o2) {
return ObjectUtils.compare(o1.getName(), o2.getName());
}
});
for (FeedSubscription subscription : subscriptions) { for (FeedSubscription subscription : subscriptions) {
if ((id == null && subscription.getCategory() == null) if ((id == null && subscription.getCategory() == null)
@@ -204,6 +212,12 @@ public class SubscriptionsREST extends AbstractREST {
category.getFeeds().add(sub); category.getFeeds().add(sub);
} }
} }
Collections.sort(category.getFeeds(), new Comparator<Subscription>() {
@Override
public int compare(Subscription o1, Subscription o2) {
return ObjectUtils.compare(o1.getName(), o2.getName());
}
});
return category; return category;
} }