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 lists before changing position

Browse Source
This commit is contained in:
Athou
2013-06-04 07:26:32 +02:00
parent 41344e08f7
commit c5ab0e7efe
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
View File

@@ -270,6 +270,13 @@ public class CategoryREST extends AbstractResourceREST {
if (req.getPosition() != null) {
List<FeedCategory> categories = feedCategoryDAO.findByParent(
getUser(), parent);
Collections.sort(categories, new Comparator<FeedCategory>() {
@Override
public int compare(FeedCategory o1, FeedCategory o2) {
return ObjectUtils.compare(o1.getPosition(), o2.getPosition());
}
});
int existingIndex = -1;
for (int i = 0; i < categories.size(); i++) {
if (ObjectUtils.equals(categories.get(i).getId(),

9
src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
View File

@@ -3,6 +3,8 @@ package com.commafeed.frontend.rest.resources;
import java.io.StringWriter;
import java.net.URI;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
@@ -332,6 +334,13 @@ public class FeedREST extends AbstractResourceREST {
if (req.getPosition() != null) {
List<FeedSubscription> subs = feedSubscriptionDAO.findByCategory(
getUser(), parent);
Collections.sort(subs, new Comparator<FeedSubscription>() {
@Override
public int compare(FeedSubscription o1, FeedSubscription o2) {
return ObjectUtils.compare(o1.getPosition(), o2.getPosition());
}
});
int existingIndex = -1;
for (int i = 0; i < subs.size(); i++) {
if (ObjectUtils.equals(subs.get(i).getId(),